From 7ec7876ef01e8561b256cbcf1ae48e51d4bbc780 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Mon, 13 Feb 2023 14:52:42 +0800 Subject: [PATCH] fix bug --- .../controller/market/WxCouponController.java | 110 ++++++++++-------- .../market/WxOrderGroupController.java | 23 ++-- .../java/com/iformall/domain/po/WxCoupon.java | 3 + .../domain/vo/WxOrderGroupMarketing.java | 3 + 4 files changed, 79 insertions(+), 60 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 37b2e84f5..bfc67d5f6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -456,16 +456,18 @@ public class WxCouponController extends BaseController { // wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); // } 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); + if (EnumYesOrNo.YES.getCode() == wxCoupon.getPutIn()) { + //根据上架时间查询券 + 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 pageInfo = wxCouponService.findCountData(wxCoupon,tenantEntitys, pageNum, pageSize); for (WxCouponStatisVo coupon : pageInfo.getList()) { @@ -498,16 +500,18 @@ public class WxCouponController extends BaseController { // wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); // } 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); + if (EnumYesOrNo.YES.getCode() == wxCoupon.getPutIn()) { + //根据上架时间查询券 + 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); + } } wxCouponService.exportCardData(wxCoupon,tenantEntitys, request, response); } @@ -532,16 +536,18 @@ public class WxCouponController extends BaseController { // } 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); + if (EnumYesOrNo.YES.getCode() == wxCoupon.getPutIn()) { + //根据上架时间查询券 + 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 pageInfo = wxCouponService.findCouponData(wxCoupon, tenantEntitys, pageNum, pageSize); @@ -572,16 +578,18 @@ public class WxCouponController extends BaseController { // } 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); + if (EnumYesOrNo.YES.getCode() == wxCoupon.getPutIn()) { + //根据上架时间查询券 + 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); + } } wxCouponService.exportCouponData(wxCoupon,tenantEntitys, request, response); } @@ -624,16 +632,18 @@ public class WxCouponController extends BaseController { //根据投放时间搜索 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); - } + if (EnumYesOrNo.YES.getCode() == wxCoupon.getPutIn()) { + 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") 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 19d8483de..6d483f91e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java @@ -8,6 +8,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxOrderGroupMarketing; +import com.iformall.enums.EnumYesOrNo; import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxMallService; import com.iformall.service.WxOrderGroupService; @@ -79,16 +80,18 @@ public class WxOrderGroupController extends BaseController { //处理投放时间 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"); - } + if (EnumYesOrNo.YES.getCode() == wxOrderGroupMarketing.getPutIn()) { + 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/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index 36cc5f6c3..bfed536f9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -400,6 +400,9 @@ public class WxCoupon extends TenantEntity { @TableField(exist = false) private String[] mallTenantIds; + + @TableField(exist = false) + private Integer putIn;//是否已投放 public String getSalePriceStr() { if(salePrice!=null) { diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java index 817a359f1..be1752080 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java @@ -59,5 +59,8 @@ public class WxOrderGroupMarketing extends TenantEntity { @TableField(exist = false) private List couponIdList; + + @TableField(exist = false) + private Integer putIn;//是否已投放 }