wangtao il y a 3 ans
Parent
commit
d903c81fa9

+ 4 - 2
lb-app/src/main/java/com/ydd/app/controller/MemberApi.java

@@ -183,17 +183,19 @@ public class MemberApi extends BaseController {
     /**
      * 账户流水
      */
+    @ApiOperation("账户流水")
     @GetMapping(value = "/accountFlow")
     @AccessToken
-    @ControllerLog("账户流水")
+    //@ControllerLog("账户流水")
     public BaseResult<PageResult> getAccountFlow(AccountFlowListRequest request) {
         PageResult pageResult = apiMemberService.getAccountFlow(getLoginId(), request);
         return BaseResult.success(pageResult);
     }
 
+    @ApiOperation("充值流水")
     @GetMapping(value = "/rechargeList")
     @AccessToken
-    @ControllerLog("充值流水")
+   // @ControllerLog("充值流水")
     public BaseResult<PageResult> rechargeList(@RequestParam("startTime") String startTime,
                                                @RequestParam("endTime") String endTime) {
         Long memberId =getLoginId();

+ 1 - 1
lb-module/src/main/java/com/ydd/module/service/impl/RechargeServiceImpl.java

@@ -78,7 +78,7 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
             lqw.ge(Recharge::getCreateTime ,recharge.getStartTime());
         }
         if (StringUtils.isNotBlank(recharge.getEndTime())){
-            lqw.le(Recharge::getCreateTime ,recharge.getEndTime());
+            lqw.le(Recharge::getCreateTime ,recharge.getEndTime()+" 23:59:59");
         }
         return this.list(lqw);
     }

+ 1 - 1
lb-module/src/main/resources/mapper/module/orderMapper.xml

@@ -729,7 +729,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="city != null and city!=''">
             AND  send_city_name like concat('%', #{city}, '%'))
         </if>
-        <if test="delivery_id != null ">
+        <if test="deliveryId != null ">
             AND delivery_id = #{deliveryId}
         </if>
         ORDER BY create_time DESC