Browse Source

bug

release_toaliyun_real
xhxu 5 years ago
parent
commit
5d13b0fb1f
3 changed files with 8 additions and 4 deletions
  1. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +2
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java
  3. +4
    -2
      mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java

+ 2
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java View File

@@ -96,7 +96,8 @@ public class WxCouponController extends BaseController {
EnumCouponType.COUPON_LIPIN.getCode(),
EnumCouponType.COUPON_TINGCHE.getCode(),
EnumCouponType.COUPON_MULTIMCH.getCode(),
EnumCouponType.COUPON_PRESS.getCode()};
EnumCouponType.COUPON_PRESS.getCode(),
EnumCouponType.COUPON_PREORDER.getCode()};

wxCoupon.setTypes(Arrays.asList(typeArray));
if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){


+ 2
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java View File

@@ -93,7 +93,8 @@ public class WxCouponController extends BaseController {
EnumCouponType.COUPON_LIPIN.getCode(),
EnumCouponType.COUPON_TINGCHE.getCode(),
EnumCouponType.COUPON_MULTIMCH.getCode(),
EnumCouponType.COUPON_PRESS.getCode()};
EnumCouponType.COUPON_PRESS.getCode(),
EnumCouponType.COUPON_PREORDER.getCode()};

wxCoupon.setTypes(Arrays.asList(typeArray));
wxCoupon.setMerchantId(getLoginBUser().getMerchantId());


+ 4
- 2
mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java View File

@@ -416,7 +416,8 @@ public class PosServiceImpl implements PosService {
if (!(couponType.getCode().equals(EnumCouponType.COUPON_MULTIMCH.getCode()) ||
couponType.getCode().equals(EnumCouponType.COUPON_LIPIN.getCode()) ||
couponType.getCode().equals(EnumCouponType.COUPON_PRESS.getCode()) ||
couponType.getCode().equals(EnumCouponType.COUPON_GROUP.getCode()))
couponType.getCode().equals(EnumCouponType.COUPON_GROUP.getCode()) ||
couponType.getCode().equals(EnumCouponType.COUPON_PREORDER.getCode()))
) {
logger.error(ErrorCode.VERIFY_COUPON_TYPE_NOT_SUPPORT.getMessage());
throw new MallinkException(ErrorCode.VERIFY_COUPON_TYPE_NOT_SUPPORT);
@@ -454,7 +455,8 @@ public class PosServiceImpl implements PosService {
if (!(couponType.getCode().equals(EnumCouponType.COUPON_MULTIMCH.getCode()) ||
couponType.getCode().equals(EnumCouponType.COUPON_LIPIN.getCode()) ||
couponType.getCode().equals(EnumCouponType.COUPON_PRESS.getCode()) ||
couponType.getCode().equals(EnumCouponType.COUPON_GROUP.getCode()))
couponType.getCode().equals(EnumCouponType.COUPON_GROUP.getCode()) ||
couponType.getCode().equals(EnumCouponType.COUPON_PREORDER.getCode()))
) {
logger.error(ErrorCode.VERIFY_COUPON_TYPE_NOT_SUPPORT.getMessage());
throw new MallinkException(ErrorCode.VERIFY_COUPON_TYPE_NOT_SUPPORT);


Loading…
Cancel
Save