From 7fd431f2c733b5a0c052d11becb9e77a876bc3f8 Mon Sep 17 00:00:00 2001 From: Burce Date: Fri, 30 Aug 2019 20:20:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E6=B3=A8=E5=88=B8->=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/WxCouponSend.java | 38 +++++++++++++++++++ .../iformall/mapper/WxCouponSendMapper.java | 1 + .../service/impl/WxCouponSendServiceImpl.java | 15 ++++++-- .../resources/mapper/WxCouponSendMapper.xml | 10 ++++- 4 files changed, 60 insertions(+), 4 deletions(-) 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 a24f17bdb..ab46e731d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java @@ -1,5 +1,6 @@ package com.iformall.domain.po; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -29,15 +30,35 @@ public class WxCouponSend extends BaseEntity { /** * limit 商户购券数 */ + @JsonIgnore @Transient public static final String KEY_MERCHANT_LNVENTORY = "merchantLnventory" ; /** * limit 商户注券数 */ + @JsonIgnore @Transient public static final String KEY_MERCHANT_SEND = "merchantSend" ; + /** + * 排序-商户购券数 + */ + @JsonIgnore + public static final String SORT_MERCHANT_LNVENTORY = "merchantLnventory" ; + + /** + * 排序-商户已发数 + */ + @JsonIgnore + public static final String SORT_MERCHANT_SEND = "merchantSend" ; + + /** + * 排序-商户剩余数 + */ + @JsonIgnore + public static final String SORT_REMAIN = "merchantRemain" ; + @Id protected Long id; @@ -50,6 +71,18 @@ public class WxCouponSend extends BaseEntity { @Transient protected Integer merchantLnventory; + /** + * 商户已发数 + */ + @Transient + protected Integer merchantSend; + + /** + * 商户剩余数 + */ + @Transient + protected Integer merchantRemain; + /**发卷所属商户名**/ @Transient private String merchantName; @@ -89,4 +122,9 @@ public class WxCouponSend extends BaseEntity { @Transient private Integer expired; + @JsonIgnore + @io.swagger.annotations.ApiModelProperty(value = "0未过期1已过期,全部时不传", name = "expired" ) + @Transient + private String sortCol ; + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendMapper.java index 33dd66b5a..c9bceb231 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendMapper.java @@ -4,6 +4,7 @@ import java.util.*; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxCouponSend; import com.iformall.domain.vo.WxCouponSendVo; +import org.apache.ibatis.annotations.Param; public interface WxCouponSendMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java index a10c6ce53..f584cd4f7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -67,15 +67,24 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { @Override public PageInfo listAsPage(WxCouponSend record, Integer pageIndex, Integer pageSize) { PageInfo pageInfo; - //设置商户购买券数 + /** + * 设置商户购买券数 + * 前端排序:时间、商户总库存、商户已发数、商户剩余 + */ if (Objects.equals(EnumCouponSendSendType.MERCHANT.getCode(), record.getSendType())) { + String sortStr = null; + if (Objects.equals(record.getSortColumn(), WxCouponSend.SORT_MERCHANT_LNVENTORY) || + Objects.equals(record.getSortColumn(), WxCouponSend.SORT_MERCHANT_SEND) || + Objects.equals(record.getSortColumn(), WxCouponSend.SORT_REMAIN)) { + sortStr = record.getSortColumn() + " " + record.getSortOrder(); + record.setSortColumn(null); + } + record.setSortCol(sortStr); pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponSendMapper.findListVoByValidType(record)); for (WxCouponSendVo cs : pageInfo.getList()) { JSONObject jo = JSONObject.parseObject(cs.getConditions()); int inventory = jo.getIntValue(WxCouponSend.KEY_MERCHANT_LNVENTORY); - int sendCound = jo.getIntValue(WxCouponSend.KEY_MERCHANT_SEND); cs.setInventory(inventory); - cs.setSendCount(sendCound); } } else { pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponSendMapper.findListVo(record)); diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml index f41ebfc11..36d4e2baa 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml @@ -25,6 +25,9 @@ cs.id,cs.tenant_id,cs.coupon_id,cs.title,cs.send_type,cs.conditions,cs.status,cs.create_date,cs.update_date, + cs.conditions -> '$.merchantSend' as merchantSend, + cs.conditions -> '$.merchantLnventory' as merchantLnventory, + cs.conditions -> '$.merchantRemain' as merchantRemain, (case when (select count(*) from wx_coupon_merchant xcm where xcm.product_id = cs.coupon_id and xcm.status = 0)=1 then @@ -96,7 +99,9 @@ and cs.send_sms = #{sendSms} - order by ${sortColumns} + + order by ${sortColumns} + update wx_coupon_send set status=#{status}