瀏覽代碼

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

release_toaliyun_real
xiaohanzi 4 年之前
父節點
當前提交
a27a3bb8ea
共有 2 個檔案被更改,包括 3 行新增3 行删除
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/service/helper/WxCUserTagsServiceHelper.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/helper/WxCUserTagsServiceHelper.java 查看文件

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


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java 查看文件

@@ -442,7 +442,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
if(cm == null){
throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERCHANT_IS_NULL);
}
if(EnumCouponVerifyType.VERIFY_B.equals(couponVerifyType) && !cm.getId().equals(bUser.getMerchantId())){
if(EnumCouponVerifyType.VERIFY_B.equals(couponVerifyType) && !cm.getMerchantId().equals(bUser.getMerchantId())){
throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERCHANT_IS_NULL);
}
merchantId = cm.getId();


Loading…
取消
儲存