From 05fcabe111374151b4cc7aac3ab1f5e08cbc8343 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 2 Jul 2019 17:02:30 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A2=E6=9C=8D=E5=AD=97=E6=AE=B5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/market/WxCouponController.java | 7 +++++++ .../db/migration/V201907021649__L_ALTER_MER.sql | 2 ++ .../src/main/java/com/iformall/common/ErrorCode.java | 1 + .../main/java/com/iformall/domain/po/WxMerchant.java | 3 +++ .../java/com/iformall/domain/vo/WxMerchantVo.java | 2 ++ .../java/com/iformall/service/WxCouponService.java | 1 + .../iformall/service/impl/WxCouponServiceImpl.java | 12 ++++++++++++ .../src/main/resources/mapper/WxBusinessMapper.xml | 2 +- .../src/main/resources/mapper/WxMerchantMapper.xml | 8 +++++--- 9 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201907021649__L_ALTER_MER.sql diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 55938934d..4aa68c51c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -174,6 +174,13 @@ public class WxCouponController extends BaseController { } wxCoupon.setTenantId(getTenantId()); + WxCoupon coupon = wxCouponService.findById(wxCoupon); + if(coupon!=null){ + if(wxCoupon.getValidEndDate().before(coupon.getValidEndDate())){ + return new ResultData(ErrorCode.COUPON_STOCK_ENDTIME_ERR); + } + } + //启动审批流 if(wxCoupon.getFlowParams() != null && wxCoupon.getFlowParams().size() >0){ List> variables = (List)wxCoupon.getFlowParams().get("variables"); diff --git a/mallinkAdmin/src/main/resources/db/migration/V201907021649__L_ALTER_MER.sql b/mallinkAdmin/src/main/resources/db/migration/V201907021649__L_ALTER_MER.sql new file mode 100644 index 000000000..30e2329b3 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201907021649__L_ALTER_MER.sql @@ -0,0 +1,2 @@ +ALTER TABLE `wx_merchant` +ADD COLUMN `link_line_phone` varchar(100) NULL DEFAULT NULL COMMENT '客服电话'; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 58bb6c49d..6eaac7b4d 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -113,6 +113,7 @@ public enum ErrorCode{ COUPON_ONLY_FOR_NEW_MEMBER(2038, "您已参加过新会员活动"), COUPON_SCORE_NOT_IN_RANGE(2038, "您的成长值/等级与要求不符"), COUPON_STOCK_NO_EQUAL_ERR(2039, "券库存设置要保证同增同减"), + COUPON_STOCK_ENDTIME_ERR(2043, "抱歉,有效期截止时间只能增加不能减少!"), PUSH_LIMIT_UP_TO_1DAYLIMIT(2040, "此用户一天内发券到达疲劳度限制"), PUSH_LIMIT_UP_TO_COUPONLIMIT(2041, "此用户发此券到达疲劳度限制"), diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index bb924f50a..cd10a652b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -183,6 +183,9 @@ public class WxMerchant extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "辅谈人", name = "talkUserAux") private String talkUserAux; + @io.swagger.annotations.ApiModelProperty(value = "客服电话", name = "linkLinePhone") + private String linkLinePhone; + @Transient private WxProfitSharingReceiver wxProfitSharingReceiver; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java index b3d1d1acf..e2df89c32 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java @@ -81,4 +81,6 @@ public class WxMerchantVo { @io.swagger.annotations.ApiModelProperty(value="优惠活动",name="actionDesc") private String actionDesc; + @io.swagger.annotations.ApiModelProperty(value = "客服电话", name = "linkLinePhone") + private String linkLinePhone; } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index cb260e70c..b977c216e 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -200,5 +200,6 @@ public interface WxCouponService { */ ResultData updateCouponStockAndEndTime(WxCoupon wxCoupon); + WxCoupon findById(WxCoupon wxCoupon); } 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 abd3ea428..a22a32763 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -17,6 +17,7 @@ import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; import com.iformall.service.*; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -623,4 +624,15 @@ public class WxCouponServiceImpl implements WxCouponService { public void update(WxCoupon record) { wxCouponMapper.updateByPrimaryKeySelective(record); } + + @Override + public WxCoupon findById(WxCoupon wxCoupon) { + WxCoupon query = new WxCoupon(); + query.setId(wxCoupon.getId()); + List list = wxCouponMapper.findCouponList(query); + if(CollectionUtils.isNotEmpty(list)){ + return list.get(0); + } + return null; + } } diff --git a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml index 7871400d9..164d9f6f8 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml @@ -157,7 +157,7 @@ @@ -178,7 +179,8 @@ - + +