| @@ -131,7 +131,6 @@ public class WxCouponOrderController extends BaseController { | |||||
| } | } | ||||
| @RedisCache | |||||
| @ApiOperation("某日期交易总流水") | @ApiOperation("某日期交易总流水") | ||||
| @GetMapping("getUnverifiedAmountOnDate") | @GetMapping("getUnverifiedAmountOnDate") | ||||
| @ApiImplicitParams({ | @ApiImplicitParams({ | ||||
| @@ -140,7 +139,6 @@ public class WxCouponOrderController extends BaseController { | |||||
| return wxCouponOrderService.listOnDateAsPage(getLoginBUser().getId(), date, null, null, false); | return wxCouponOrderService.listOnDateAsPage(getLoginBUser().getId(), date, null, null, false); | ||||
| } | } | ||||
| @RedisCache | |||||
| @ApiOperation("某日期核销总流水") | @ApiOperation("某日期核销总流水") | ||||
| @GetMapping("getVerifiedAmountOnDate") | @GetMapping("getVerifiedAmountOnDate") | ||||
| @ApiImplicitParams({ | @ApiImplicitParams({ | ||||
| @@ -54,7 +54,7 @@ public class DaliyAmountSchedule { | |||||
| merchantBUserQ.updateTenantInfo(merchant); | merchantBUserQ.updateTenantInfo(merchant); | ||||
| merchantBUserQ.setMerchantId(merchant.getId()); | merchantBUserQ.setMerchantId(merchant.getId()); | ||||
| List<Long> bUserIds = wxMerchantBUserMapper.findIdList(merchantBUserQ); | List<Long> bUserIds = wxMerchantBUserMapper.findIdList(merchantBUserQ); | ||||
| dateMap.put("bUserIds", bUserIds); | |||||
| dateMap.put("bUserIdList", bUserIds); | |||||
| List<WxCouponOrder> list = wxCouponOrderMapper.findListOfOrderedByDate(dateMap); | List<WxCouponOrder> list = wxCouponOrderMapper.findListOfOrderedByDate(dateMap); | ||||
| logger.info("find " + list.size() + " coupon order from " + startDate + " to " + endDate); | logger.info("find " + list.size() + " coupon order from " + startDate + " to " + endDate); | ||||
| @@ -284,7 +284,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| merchantBUserQ.updateTenantInfo(wxMerchant); | merchantBUserQ.updateTenantInfo(wxMerchant); | ||||
| merchantBUserQ.setMerchantId(wxMerchant.getId()); | merchantBUserQ.setMerchantId(wxMerchant.getId()); | ||||
| List<Long> bUserIds = wxMerchantBUserMapper.findIdList(merchantBUserQ); | List<Long> bUserIds = wxMerchantBUserMapper.findIdList(merchantBUserQ); | ||||
| dateMap.put("bUserIds", bUserIds); | |||||
| dateMap.put("bUserIdList", bUserIds); | |||||
| list = wxCouponOrderMapper.findListOfVerifiedByDate(dateMap); | list = wxCouponOrderMapper.findListOfVerifiedByDate(dateMap); | ||||
| }else { | }else { | ||||
| dateMap.put("startDateTimes", startDate.getTime()); | dateMap.put("startDateTimes", startDate.getTime()); | ||||
| @@ -160,9 +160,9 @@ | |||||
| from wx_coupon_order co | from wx_coupon_order co | ||||
| where co.tenant_id = #{tenantId} | where co.tenant_id = #{tenantId} | ||||
| AND co.coupon_order_status = '1' | AND co.coupon_order_status = '1' | ||||
| <if test=" null != bUserIds "> | |||||
| <if test=" null != bUserIdList "> | |||||
| and co.b_user_id in | and co.b_user_id in | ||||
| <foreach collection="bUserIds" index="index" item="bUserIdItem" open="(" separator="," close=")"> | |||||
| <foreach collection="bUserIdList" index="index" item="bUserIdItem" open="(" separator="," close=")"> | |||||
| #{bUserIdItem} | #{bUserIdItem} | ||||
| </foreach> | </foreach> | ||||
| </if> | </if> | ||||