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