diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxCUserTagsServiceHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxCUserTagsServiceHelper.java index 8b7004123..106d8c268 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxCUserTagsServiceHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxCUserTagsServiceHelper.java @@ -368,14 +368,16 @@ public class WxCUserTagsServiceHelper{ int count = 0; if(cardSpendCountList.size() > 0) { for (Map 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 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"); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index a699ef292..b867ca7dc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -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;