Browse Source

Merge branch 'release_real_20211001' of https://git.malls.iformall.com/server/formallProject into release_real_20211001

release_toaliyun_real
xiaohanzi 4 years ago
parent
commit
ca8a8b29d2
2 changed files with 5 additions and 7 deletions
  1. +4
    -2
      mallinkService/src/main/java/com/iformall/service/helper/WxCUserTagsServiceHelper.java
  2. +1
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

+ 4
- 2
mallinkService/src/main/java/com/iformall/service/helper/WxCUserTagsServiceHelper.java View File

@@ -368,14 +368,16 @@ public class WxCUserTagsServiceHelper{
int count = 0;
if(cardSpendCountList.size() > 0) {
for (Map<String, Object> cardSpendCount : cardSpendCountList) {
if (cardSpendCount.get("business_id").equals(b.getId().toString())) {
if (cardSpendCount.get("business_id") != null
&& cardSpendCount.get("business_id").equals(b.getId().toString())) {
count += (Integer) cardSpendCount.get("bu_count");
}
}
}
if(cardOrderCountList.size() > 0) {
for (Map<String, Object> cardOrderCount : cardOrderCountList) {
if (cardOrderCount.get("business").equals(b.getId().toString())) {
if (cardOrderCount.get("business") != null
&& cardOrderCount.get("business").equals(b.getId().toString())) {
count += (Integer) cardOrderCount.get("bu_count");
}
}


+ 1
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java View File

@@ -421,10 +421,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
logger.error("券已被预核销: couponOrder-" + couponOrder.getId());
throw new MallinkException(ErrorCode.COUPON_ORDER_IS_PRE_VERIFY);
}
if(EnumCouponType.COUPON_GIFT.getCode().equals(wxCoupon.getType())){
logger.error("券为礼包卷: couponOrder-" + couponOrder.getId() );
throw new MallinkException(ErrorCode.COUPON_ORDER_TYPE_NOT_SUPPORTED);
}

// 2. 检查适用门店
Long merchantId = null;
@@ -445,7 +441,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
if(EnumCouponVerifyType.VERIFY_B.equals(couponVerifyType) && !cm.getMerchantId().equals(bUser.getMerchantId())){
throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERCHANT_IS_NULL);
}
merchantId = cm.getId();
merchantId = cm.getMerchantId();
}else if(EnumCouponType.COUPON_GIFT.getCode().equals(wxCoupon.getType())){
if (StringUtils.isBlank(wxCoupon.getGiftList())){
logger.error("券包: coupon-" + wxCoupon.getId() + "数据异常" + "couponOrder-" + couponOrder.getId());


Loading…
Cancel
Save