From 91d268a75c2ef4b1b238f0ca8f3626d0f65c6456 Mon Sep 17 00:00:00 2001 From: zhengfangyuan Date: Tue, 6 Sep 2022 15:53:17 +0800 Subject: [PATCH 1/5] fix bug --- .../market/WxPressBatchController.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java index 141253078..cc84f3ccc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java @@ -96,7 +96,7 @@ public class WxPressBatchController extends BaseController { return new ResultData(list); } - @ApiOperation("详情接口") + @ApiOperation("删除接口") @PostMapping("delete") public ResultData delete(@RequestBody WxPressBatch record) { if (null == record.getId()) { @@ -145,6 +145,21 @@ public class WxPressBatchController extends BaseController { wxPressBatchService.updateStatus(record); return new ResultData(); } + + @ApiOperation("详情接口") + @PostMapping("setRules") + public ResultData setRules(@RequestBody WxPressBatch record) { + if (null == record.getId()) { + return new ResultData(Result.ERROR,"参数错误"); + } + WxPressBatch record1 = wxPressBatchService.getById(record.getId(), getTenantInfo().getTenantId()); + record1.setPromoterLimitRule(record.getPromoterLimitRule()); + record1.setPromoterAllowCount(record.getPromoterAllowCount()); + record1.setBargainerAllowCount(record1.getBargainerAllowCount()); + record1.setBargainerAllowSame(record.getBargainerAllowSame()); + wxPressBatchService.saveOrUpdate(record1); + return new ResultData(); + } From 6702fb99867893c1974c0b9bd64b614ad6b36895 Mon Sep 17 00:00:00 2001 From: zhengfangyuan Date: Tue, 6 Sep 2022 16:49:08 +0800 Subject: [PATCH 2/5] fix pressbatch bug --- .../com/iformall/controller/market/WxPressBatchController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java index cc84f3ccc..a6c789ba7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java @@ -155,7 +155,7 @@ public class WxPressBatchController extends BaseController { WxPressBatch record1 = wxPressBatchService.getById(record.getId(), getTenantInfo().getTenantId()); record1.setPromoterLimitRule(record.getPromoterLimitRule()); record1.setPromoterAllowCount(record.getPromoterAllowCount()); - record1.setBargainerAllowCount(record1.getBargainerAllowCount()); + record1.setBargainerAllowCount(record.getBargainerAllowCount()); record1.setBargainerAllowSame(record.getBargainerAllowSame()); wxPressBatchService.saveOrUpdate(record1); return new ResultData(); From e828d73ad7902375ad4d9a3c3d2fc62669f17c80 Mon Sep 17 00:00:00 2001 From: zhengfangyuan Date: Tue, 6 Sep 2022 19:19:26 +0800 Subject: [PATCH 3/5] fix press --- .../market/WxPressBatchController.java | 51 +++++++++++++++++-- .../mapper/WxCouponChannelMapper.java | 2 + .../service/WxCouponChannelService.java | 1 + .../iformall/service/WxPressBatchService.java | 1 + .../impl/WxCouponChannelServiceImpl.java | 5 ++ .../service/impl/WxPressBatchServiceImpl.java | 8 +++ .../mapper/WxCouponChannelMapper.xml | 5 ++ 7 files changed, 70 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java index a6c789ba7..402622cb9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java @@ -9,14 +9,20 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.AliBusinessCircleOrder; import com.iformall.domain.po.WxBusinessCircleOrder; import com.iformall.domain.po.WxCoupon; +import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.WxPressBatch; import com.iformall.domain.po.WxPressBatchItem; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.enums.EnumCouponChannelStatus; +import com.iformall.enums.EnumCouponChannelType; import com.iformall.enums.EnumCouponContentType; import com.iformall.enums.EnumCouponSourceType; +import com.iformall.enums.EnumCouponType; import com.iformall.enums.EnumRentContractAppStatus; import com.iformall.service.AliBusinessCircleOrderService; +import com.iformall.service.WxCouponChannelService; +import com.iformall.service.WxCouponService; import com.iformall.service.WxPressBatchService; import com.iformall.utils.Constant; import io.swagger.annotations.Api; @@ -46,7 +52,13 @@ public class WxPressBatchController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired - private WxPressBatchService wxPressBatchService; + WxPressBatchService wxPressBatchService; + + @Autowired + WxCouponService wxCouponService; + + @Autowired + WxCouponChannelService wxCouponChannelService; @ApiOperation("分页列表接口") @GetMapping("list") @@ -84,7 +96,7 @@ public class WxPressBatchController extends BaseController { return new ResultData(order); } - @ApiOperation("详情接口") + @ApiOperation("砍价券接口") @GetMapping("itemList") @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)}) @@ -92,7 +104,15 @@ public class WxPressBatchController extends BaseController { if (null == id) { return new ResultData(Result.ERROR,"参数错误"); } - List list = wxPressBatchService.getItemList(id, getTenantInfo().getTenantId()); + List couponIdList = wxPressBatchService.getItemCouponIdList(id, getTenantInfo().getTenantId()); + WxCoupon record = new WxCoupon(); + record.updateTenantInfo(getTenantInfo()); + if (null != couponIdList && couponIdList.size() > 0 ) { + record.setIds(couponIdList); + }else { + record.setId(0L); + } + List list = wxCouponService.list(record); return new ResultData(list); } @@ -105,6 +125,31 @@ public class WxPressBatchController extends BaseController { wxPressBatchService.deleteBatch(record.getId(), getTenantInfo().getTenantId()); return new ResultData(); } + + @ApiOperation("已投放砍价券列表接口") + @GetMapping("couponList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true),}) + public ResultData couponList(@ModelAttribute WxCoupon record, Integer pageNum, Integer pageSize) { + WxCouponChannel couponChannelQ = new WxCouponChannel(); + couponChannelQ.updateTenantInfo(getTenantInfo()); + couponChannelQ.setType(EnumCouponType.COUPON_PRESS.getCode()); + couponChannelQ.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_PRESS.getCode()); + couponChannelQ.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); + List couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ); + if (null == record) { + record = new WxCoupon(); + } + record.updateTenantInfo(couponChannelQ); + if (null != couponIds && couponIds.size() > 0 ) { + record.setIds(couponIds); + }else { + record.setId(0L); + } + PageInfo page = wxCouponService.listAsPage(record, pageNum, pageSize); + return new ResultData(page); + } @ApiOperation("新增items") diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java index 772e28109..7a6ab3547 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java @@ -13,6 +13,8 @@ public interface WxCouponChannelMapper extends CommonMapper findList(WxCouponChannel wxCouponChannel); + + List findCouponIdList(WxCouponChannel wxCouponChannel); int countCoupon(WxCouponChannel wxCouponChannel); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java index 2053055f8..5f53778b7 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java @@ -26,6 +26,7 @@ public interface WxCouponChannelService { */ PageInfo listAsPage(WxCouponChannel record, Integer pageIndex, Integer pageSize); List findList(WxCouponChannel record); + List findCouponIdList(WxCouponChannel record); WxCouponCVo findDetailVo(Long id,String tenantId,boolean hasMerchant); diff --git a/mallinkService/src/main/java/com/iformall/service/WxPressBatchService.java b/mallinkService/src/main/java/com/iformall/service/WxPressBatchService.java index 970a2629c..143a61507 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPressBatchService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPressBatchService.java @@ -40,6 +40,7 @@ public interface WxPressBatchService { WxPressBatch getById(Long id,String tenantId); List getItemList(Long batchId,String tenantId); + List getItemCouponIdList(Long batchId,String tenantId); void saveItems(WxPressBatch pressBatch,String[] couponIds); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index d70db8505..403e1bdf6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -113,6 +113,11 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { return wxCouponChannelMapper.findList(record); } + @Override + public List findCouponIdList(WxCouponChannel record) { + return wxCouponChannelMapper.findCouponIdList(record); + } + @Override public WxCouponChannel getById(Long id,String tenantId) { return wxCouponChannelMapper.selectById(id,tenantId); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java index bd7cfa1bb..cafa1dbe6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java @@ -94,6 +94,14 @@ public class WxPressBatchServiceImpl implements WxPressBatchService { return wxPressBatchItemMapper.findList(iteq); } + @Override + public List getItemCouponIdList(Long batchId, String tenantId) { + WxPressBatchItem iteq = new WxPressBatchItem(); + iteq.setTenantId(tenantId); + iteq.setPressBatchId(batchId); + return wxPressBatchItemMapper.getCouponIds(batchId, tenantId, null); + } + @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public void saveItems(WxPressBatch pressBatch, String[] couponIds) { diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index d4a0848e8..5f6cbef84 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -143,6 +143,11 @@ select from wx_coupon_channel cc + + update wx_coupon_channel From 40c8e54cd694859e43d7618689db2f5813eda4b3 Mon Sep 17 00:00:00 2001 From: zhengfangyuan Date: Tue, 6 Sep 2022 19:41:02 +0800 Subject: [PATCH 4/5] fix press --- .../iformall/controller/market/WxPressBatchController.java | 2 +- .../src/main/java/com/iformall/service/WxCouponService.java | 2 ++ .../java/com/iformall/service/impl/WxCouponServiceImpl.java | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java index 402622cb9..1c824750e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java @@ -147,7 +147,7 @@ public class WxPressBatchController extends BaseController { }else { record.setId(0L); } - PageInfo page = wxCouponService.listAsPage(record, pageNum, pageSize); + PageInfo page = wxCouponService.simplelistAsPage(record, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index 486c62be9..4fd278442 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -31,6 +31,8 @@ public interface WxCouponService { * @return */ PageInfo listAsPage(WxCoupon record, Integer pageIndex, Integer pageSize); + + PageInfo simplelistAsPage(WxCoupon record, Integer pageIndex, Integer pageSize); /** * 卡类列表,包括统计 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 323481746..99c76dd92 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -210,6 +210,11 @@ public class WxCouponServiceImpl implements WxCouponService { public List list(WxCoupon wxCoupon){ return wxCouponMapper.findList(wxCoupon); } + + @Override + public PageInfo simplelistAsPage(WxCoupon record, Integer pageNum, Integer pageSize) { + return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxCouponMapper.findList(record)); + } @Override public PageInfo listAsPage(WxCoupon record, Integer pageIndex, Integer pageSize) { From 3b909509e282ab16a22a5444d5eae2b392cdf1c4 Mon Sep 17 00:00:00 2001 From: zhengfangyuan Date: Tue, 6 Sep 2022 19:59:26 +0800 Subject: [PATCH 5/5] fix press batch --- .../market/WxPressBatchController.java | 32 +++++++++++++------ .../iformall/domain/po/WxPressBatchItem.java | 4 +++ 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java index 1c824750e..2633b5fda 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java @@ -104,16 +104,30 @@ public class WxPressBatchController extends BaseController { if (null == id) { return new ResultData(Result.ERROR,"参数错误"); } - List couponIdList = wxPressBatchService.getItemCouponIdList(id, getTenantInfo().getTenantId()); - WxCoupon record = new WxCoupon(); - record.updateTenantInfo(getTenantInfo()); - if (null != couponIdList && couponIdList.size() > 0 ) { - record.setIds(couponIdList); - }else { - record.setId(0L); + TenantEntity tenantEntity = getTenantInfo(); + List items = wxPressBatchService.getItemList(id, tenantEntity.getTenantId()); + if (null != items && items.size() > 0 ) { + List couponIdList = wxPressBatchService.getItemCouponIdList(id, tenantEntity.getTenantId()); + WxCoupon record = new WxCoupon(); + record.updateTenantInfo(getTenantInfo()); + if (null != couponIdList && couponIdList.size() > 0 ) { + record.setIds(couponIdList); + }else { + record.setId(0L); + } + List list = wxCouponService.list(record); + Map couponMap = new HashMap(); + if (null != list && list.size() > 0 ) { + for (WxCoupon c : list) { + couponMap.put(c.getId(), c); + } + } + for (WxPressBatchItem pbi : items) { + WxCoupon coupon = couponMap.get(pbi.getCouponId()); + pbi.setCoupon(coupon); + } } - List list = wxCouponService.list(record); - return new ResultData(list); + return new ResultData(items); } @ApiOperation("删除接口") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPressBatchItem.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPressBatchItem.java index 916fa890a..34bd8cb62 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPressBatchItem.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPressBatchItem.java @@ -1,5 +1,6 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; @@ -27,4 +28,7 @@ public class WxPressBatchItem extends TenantEntity { private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; + + @TableField(exist = false) + private WxCoupon coupon; }