diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index f4a4088cc..037b100e9 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -131,7 +131,6 @@ public class WxCouponOrderController extends BaseController { } - @RedisCache @ApiOperation("某日期交易总流水") @GetMapping("getUnverifiedAmountOnDate") @ApiImplicitParams({ @@ -140,7 +139,6 @@ public class WxCouponOrderController extends BaseController { return wxCouponOrderService.listOnDateAsPage(getLoginBUser().getId(), date, null, null, false); } - @RedisCache @ApiOperation("某日期核销总流水") @GetMapping("getVerifiedAmountOnDate") @ApiImplicitParams({ diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java index 46ffae331..e7a5871b7 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java @@ -54,7 +54,7 @@ public class DaliyAmountSchedule { merchantBUserQ.updateTenantInfo(merchant); merchantBUserQ.setMerchantId(merchant.getId()); List bUserIds = wxMerchantBUserMapper.findIdList(merchantBUserQ); - dateMap.put("bUserIds", bUserIds); + dateMap.put("bUserIdList", bUserIds); List list = wxCouponOrderMapper.findListOfOrderedByDate(dateMap); logger.info("find " + list.size() + " coupon order from " + startDate + " to " + endDate); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 205bbc78b..df3282835 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -284,7 +284,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { merchantBUserQ.updateTenantInfo(wxMerchant); merchantBUserQ.setMerchantId(wxMerchant.getId()); List bUserIds = wxMerchantBUserMapper.findIdList(merchantBUserQ); - dateMap.put("bUserIds", bUserIds); + dateMap.put("bUserIdList", bUserIds); list = wxCouponOrderMapper.findListOfVerifiedByDate(dateMap); }else { dateMap.put("startDateTimes", startDate.getTime()); diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 5e8774166..e62176a4c 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -160,9 +160,9 @@ from wx_coupon_order co where co.tenant_id = #{tenantId} AND co.coupon_order_status = '1' - + and co.b_user_id in - + #{bUserIdItem}