From 1418e0abc89e83986ef51e3beb91269890a48c42 Mon Sep 17 00:00:00 2001 From: Burce Date: Mon, 19 Aug 2019 19:33:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E6=B3=A8=E5=88=B8->=E5=8D=A1?= =?UTF-8?q?=E5=88=B8=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponSendController.java | 52 +++++++++++++++++++ .../com/iformall/domain/po/WxCouponSend.java | 6 +++ .../resources/mapper/WxCouponSendMapper.xml | 3 ++ 3 files changed, 61 insertions(+) create mode 100644 mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java new file mode 100644 index 000000000..ed1abe44e --- /dev/null +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java @@ -0,0 +1,52 @@ +package com.iformall.controller; + +import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; +import com.iformall.domain.po.BaseEntity; +import com.iformall.domain.po.WxCouponSend; +import com.iformall.domain.vo.WxCouponSendVo; +import com.iformall.enums.EnumCouponSendStatus; +import com.iformall.service.WxCouponActionLogService; +import com.iformall.service.WxCouponSendService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/couponSend") +@Api(description = "商户卡券相关接口") +public class WxCouponSendController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private WxCouponSendService wxCouponSendService; + @Autowired + private WxCouponActionLogService wxCouponActionLogService; + + @ApiOperation("查询商户卡券列表") + @GetMapping("/list") + @ApiImplicitParam(name = "sendType", value = "sendType", dataType = "Long", paramType = "query", required = true) + public ResultData list(Integer sendType, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxCouponSendController::list"); + WxCouponSend wxCouponSend = new WxCouponSend(); + wxCouponSend.setSendType(sendType); + wxCouponSend.setTenantId(getTenantId()); + wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); + //库存大于0 + wxCouponSend.setInventory(0); + wxCouponSend.setSortColumns(BaseEntity.SortField.CreateDate_DESC); + final PageInfo page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize); + + for (WxCouponSendVo cs : page.getList()) { + cs.setSendCount(wxCouponActionLogService.getCountByChannelId(getTenantId(), cs.getSendType(), cs.getId())); + } + return new ResultData(page); + } + +} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java index 61bf40d58..a675e8ec0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java @@ -38,6 +38,12 @@ public class WxCouponSend extends BaseEntity { @Transient protected List ids; + /** + * 库存条件 + */ + @Transient + protected Integer inventory; + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="卡券id",name="couponId") diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml index c3fc8750b..d9af5dc99 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml @@ -87,6 +87,9 @@ and cs.send_sms = #{sendSms} + + and c.remain_inventory > #{inventory} + order by ${sortColumns}