|
|
|
@@ -174,6 +174,13 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder |
|
|
|
redisLock.unlock(lockKey, timeStr); |
|
|
|
return new ResultData(0); |
|
|
|
} |
|
|
|
|
|
|
|
try { |
|
|
|
wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.B_MICROPAY, record,EnumPayWay.PAY_WAY_NOT_UNPAY_B_MA); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("支付发券: " + e.getMessage()); |
|
|
|
} |
|
|
|
|
|
|
|
Integer businessId = EnumBusiness.BUSINESS_ID6.getCode(); |
|
|
|
if(wxMerchant != null){ |
|
|
|
businessId = wxMerchant.getBusinessId(); |
|
|
|
@@ -203,12 +210,6 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder |
|
|
|
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("支付发券: " + e.getMessage()); |
|
|
|
} |
|
|
|
|
|
|
|
redisLock.unlock(lockKey, timeStr); |
|
|
|
return new ResultData(creditNum); |
|
|
|
} |
|
|
|
|