diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 18ffe2c96..c8ff737d0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -100,6 +100,10 @@ public class TenantInfoImpl implements TenantInfo { return true; if ("com.iformall.mapper.WxActivityJoinMapper.updateStatus".equals(ms.getId())) return true; + if ("com.iformall.mapper.WxCouponMapper.findCouponList".equals(ms.getId())) + return true; + if ("com.iformall.mapper.WxCouponMapper.findCouponListCount".equals(ms.getId())) + return true; return false; } } 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 2f9af75c9..4a85aebaa 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -207,9 +207,24 @@ public class WxCoupon extends BaseEntity { @Transient private Integer pressSuccCount; + @io.swagger.annotations.ApiModelProperty(value = "过滤可投放0不过滤 1过滤", name = "filterCanPut") @Transient private Integer filterCanPut; + //审批模板id 卷、卡、拼团、砍价 + @Transient + private Long couponModelId; + @Transient + private Long cardModelId; + @Transient + private Long groupModelId; + @Transient + private Long pressModelId; + + @Transient + private Integer limitStart; + @Transient + private Integer limitEnd; @Transient @io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "flowParams") diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java b/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java index a5ae1eef1..b7ad0a81d 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java @@ -9,7 +9,7 @@ public enum EnumCouponType { // 100.消费卡 COUPON_MANJIAN(1, "满减券"), COUPON_DAIJIN(2, "代金券"), - COUPON_TUANGOU(3, "团购券"), + COUPON_TUANGOU(3, "团购券"),//弃用 COUPON_LIPIN(4, "礼品券"), COUPON_TINGCHE(5, "停车券"), COUPON_MULTIMCH(6, "通用券"), @@ -17,7 +17,6 @@ public enum EnumCouponType { COUPON_GROUP(9, "团购券"), COUPON_CREDIT(50,"积分券"), COUPON_CREDIT_PARK(51,"积分停车券"), - CARD_MULTIMCH(100, "消费卡"), ; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumFilterPut.java b/mallinkService/src/main/java/com/iformall/enums/EnumFilterPut.java new file mode 100644 index 000000000..808fa1081 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumFilterPut.java @@ -0,0 +1,35 @@ +package com.iformall.enums; + +/** + * Created by luozukai + */ +public enum EnumFilterPut{ + + NO(0, "不过滤"), + ; + + public static EnumFilterPut getEnum(Integer code) { + for (EnumFilterPut value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumFilterPut(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java index a3b013a34..870f27714 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java @@ -86,4 +86,7 @@ public interface WxCouponMapper extends CommonMapper { // 库存,有效期修改 int updateStockAndValidDate(WxCoupon wxCoupon); + WxCoupon findCouponModel(WxCoupon wxCoupon); + + Integer findCouponListCount(WxCoupon wxCoupon); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponCarServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponCarServiceImpl.java index 4243ef9f4..1c4807150 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponCarServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponCarServiceImpl.java @@ -2,7 +2,6 @@ package com.iformall.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponCar; import com.iformall.domain.vo.WxCouponCarVo; import com.iformall.mapper.WxCouponCarMapper; 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 a923a3000..6328432b3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -69,6 +69,18 @@ public class WxCouponServiceImpl implements WxCouponService { PageInfo page = null; if (wxCoupon.getStatus() != null && wxCoupon.getStatus() == -1) wxCoupon.setStatus(null); + + //除了a端列表 其他默认需要过滤 + if(!EnumFilterPut.NO.equals(wxCoupon.getFilterCanPut())) { + WxCoupon couponModel = wxCouponMapper.findCouponModel(wxCoupon); + if (couponModel != null) { + wxCoupon.setCouponModelId(couponModel.getCouponModelId()); + wxCoupon.setCardModelId(couponModel.getCardModelId()); + wxCoupon.setGroupModelId(couponModel.getGroupModelId()); + wxCoupon.setPressModelId(couponModel.getPressModelId()); + } + } + page = listAsPage(wxCoupon, pageNum, pageSize); List wxCouponList = page.getList(); @@ -111,11 +123,25 @@ public class WxCouponServiceImpl implements WxCouponService { return new ResultData(page); } - - @Override public PageInfo listAsPage(WxCoupon record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponMapper.findCouponList(record)); + int total = wxCouponMapper.findCouponListCount(record); + int pages; + if(total % pageSize == 0){ + pages = total / pageSize; + }else{ + pages = total / pageSize +1; + } + record.setLimitStart((pageIndex -1) * pageSize); + record.setLimitEnd(pageSize); + List list = wxCouponMapper.findCouponList(record); + + PageHelper.startPage(pageIndex, pageSize); + PageInfo pageInfo = new PageInfo<>(list); + pageInfo.setPages(pages); + pageInfo.setTotal(total); + PageHelper.clearPage(); + return pageInfo; } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index f08173d7e..7b5351b83 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -233,6 +233,9 @@ and `credit_refund` = #{creditRefund} + + and `credit_refund` = #{creditRefund} + and id in @@ -248,7 +251,6 @@ - order by ${sortColumns} @@ -256,7 +258,7 @@ select from wx_coupon - + @@ -405,6 +407,22 @@ and c.`auto_refund` = #{autoRefund} + + + + and if(type=8,put_apply_status =2,1=1) + + + and if(type=9,put_apply_status =2,1=1) + + + and if(type=100,put_apply_status =2,1=1) + + + + and if(type !=8 and type !=9 and type!=100,put_apply_status =2,1=1) + + and c.id in @@ -420,12 +438,6 @@ - - order by ${sortColumns} @@ -434,8 +446,18 @@ from wx_coupon c + limit #{limitStart},#{limitEnd} + + + + @@ -831,4 +853,12 @@ where cpd.tenant_id=#{tenantId} and ct.status = 0 + diff --git a/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml index 134f3619c..985f78e91 100644 --- a/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml @@ -42,4 +42,6 @@ + +