Browse Source

tt

release_toaliyun_real
xhxu 5 years ago
parent
commit
ddad6ae786
2 changed files with 18 additions and 10 deletions
  1. +11
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java
  2. +7
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java

+ 11
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java View File

@@ -320,12 +320,18 @@ public class WxCouponSendServiceImpl implements WxCouponSendService {
case COUPON_VERIFY:
case B_MICROPAY:
case C_ORDER:
if (!param.getClass().equals(WxOrder.class))
if (param.getClass().equals(WxOrder.class)){
WxOrder order = (WxOrder) param;
cUserId = order.getCUserId();
tenantEntity = order;
break;
}else if(param.getClass().equals(WxThirdPartyOrders.class)){
WxThirdPartyOrders thirdOrder = (WxThirdPartyOrders) param;
cUserId = thirdOrder.getCUserId();
tenantEntity = thirdOrder;
}else{
return false;
WxOrder order = (WxOrder) param;
cUserId = order.getCUserId();
tenantEntity = order;
break;
}
default:
return false;
}


+ 7
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java View File

@@ -173,13 +173,15 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService
record.setIncreasedPoints(creditNum);
record.setPointsUpdateTime(creditHistory.getCreateDate());
this.updatePoints(record);
}

try {
wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.B_MICROPAY, record,EnumPayWay.PAY_WAY_NOT_UNPAY_B_MA);
} catch (Exception e) {
logger.error("B端刷卡支付发券: " + e.getMessage());
try {
wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.B_MICROPAY, record,EnumPayWay.PAY_WAY_NOT_UNPAY_B_MA);
} catch (Exception e) {
logger.error("B端刷卡支付发券: " + e.getMessage());
}
}


redisLock.unlock(lockKey, timeStr);
}else {
logger.debug("CacheAspect 读库等待中, key:{}: " + lockKey);


Loading…
Cancel
Save