From ddad6ae78640f6b013790e6a3c22f2e1b7b6c730 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 21 May 2021 16:15:30 +0800 Subject: [PATCH] tt --- .../service/impl/WxCouponSendServiceImpl.java | 16 +++++++++++----- .../impl/WxThirdPartyOrdersServiceImpl.java | 12 +++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java index 8bd6eb10c..516bb55a1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -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; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java index 854cebeb1..7082e88c1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java @@ -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);