From f76141e252a5875706a0fbfafaefdfcc2357f03d Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 5 Jan 2023 18:23:54 +0800 Subject: [PATCH] //start --- .../controller/market/WxCouponController.java | 32 ++++++++++++------- .../market/WxOrderGroupController.java | 31 +++++++++++------- .../main/resources/mapper/WxCouponMapper.xml | 7 ++-- 3 files changed, 45 insertions(+), 25 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 87dca425a..cfd29f253 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -595,20 +595,11 @@ public class WxCouponController extends BaseController { TenantEntity tenantEntity = getTenantInfo(); List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); wxCoupon.updateTenantInfo(tenantEntity); + + handleCouponStartDate(wxCoupon); + wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); - //根据上架时间查询券 - WxCouponChannel couponChannelQ = new WxCouponChannel(); - couponChannelQ.updateTenantInfo(tenantEntity); - couponChannelQ.setStartdate(wxCoupon.getStartdate()); - couponChannelQ.setEnddate(wxCoupon.getEnddate()); - List couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ); - if (null != couponIds && couponIds.size() > 0 ) { - wxCoupon.setIds(couponIds); - }else { - wxCoupon.setId(-1L); - } - PageInfo pages = wxCouponService.findPressData(wxCoupon,tenantEntitys,pageNum,pageSize); return new ResultData(pages); } @@ -622,9 +613,26 @@ public class WxCouponController extends BaseController { List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); wxCoupon.updateTenantInfo(tenantEntity); wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); + + handleCouponStartDate(wxCoupon); + wxCouponService.exportPressData(wxCoupon,tenantEntitys, request, response); } + //根据投放时间搜索 + private void handleCouponStartDate(WxCoupon wxCoupon){ + WxCouponChannel couponChannelQ = new WxCouponChannel(); + couponChannelQ.updateTenantInfo(wxCoupon); + couponChannelQ.setStartdate(wxCoupon.getStartdate()); + couponChannelQ.setEnddate(wxCoupon.getEnddate()); + List couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ); + if (null != couponIds && couponIds.size() > 0 ) { + wxCoupon.setIds(couponIds); + }else { + wxCoupon.setId(-1L); + } + } + @GetMapping("exportCouponPassword") @SystemControllerLog(description = "卡券兑换码-导出数据") public void exportCouponPassword(@ModelAttribute WxCouponPassword wxCouponPassword, HttpServletRequest request, HttpServletResponse response) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java index 561d1db5b..19d8483de 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java @@ -54,17 +54,9 @@ public class WxOrderGroupController extends BaseController { TenantEntity tenantEntity = getTenantInfo(); List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); wxOrderGroupMarketing.updateTenantInfo(tenantEntity); - - WxCouponChannel couponChannelQ = new WxCouponChannel(); - couponChannelQ.updateTenantInfo(tenantEntity); - couponChannelQ.setStartdate(wxOrderGroupMarketing.getStartdate()); - couponChannelQ.setEnddate(wxOrderGroupMarketing.getEnddate()); - List couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ); - if (null != couponIds && couponIds.size() > 0 ) { - wxOrderGroupMarketing.setCouponIdList(couponIds); - }else { - wxOrderGroupMarketing.setCouponId("-1"); - } + + handleCouponStartDate(wxOrderGroupMarketing); + final PageInfo page = wxOrderGroupService.queryOrderGroupMarketingList(wxOrderGroupMarketing,tenantEntitys, pageNum, pageSize); return new ResultData(page); } @@ -79,7 +71,24 @@ public class WxOrderGroupController extends BaseController { TenantEntity tenantEntity = getTenantInfo(); List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); wxOrderGroupMarketing.updateTenantInfo(tenantEntity); + + handleCouponStartDate(wxOrderGroupMarketing); + wxOrderGroupService.exportOrderGroupMarketingList(wxOrderGroupMarketing,tenantEntitys, request, response); } + //处理投放时间 + private void handleCouponStartDate(WxOrderGroupMarketing wxOrderGroupMarketing){ + WxCouponChannel couponChannelQ = new WxCouponChannel(); + couponChannelQ.updateTenantInfo(wxOrderGroupMarketing); + couponChannelQ.setStartdate(wxOrderGroupMarketing.getStartdate()); + couponChannelQ.setEnddate(wxOrderGroupMarketing.getEnddate()); + List couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ); + if (null != couponIds && couponIds.size() > 0 ) { + wxOrderGroupMarketing.setCouponIdList(couponIds); + }else { + wxOrderGroupMarketing.setCouponId("-1"); + } + } + } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index a3d02fd51..142feb551 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -1129,8 +1129,11 @@ and c.title like concat('%', #{wxCoupon.title},'%') - - and c.`create_date` between #{wxCoupon.startdate} and #{wxCoupon.enddate} + + and c.id in + + #{idItem} + order by ${wxCoupon.sortColumns}