From fd14e25853314876f7fc3d48b7f37093267d0cfe Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 20 Jul 2021 14:36:58 +0800 Subject: [PATCH] bug --- .../src/main/java/com/iformall/utils/AppTest.java | 6 +++--- .../impl/AliBusinessCircleOrderServiceImpl.java | 13 +++++++------ .../impl/WxBusinessCircleOrderServiceImpl.java | 14 ++++++++------ .../impl/WxThirdPartyOrdersServiceImpl.java | 13 +++++++------ 4 files changed, 25 insertions(+), 21 deletions(-) diff --git a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java index bfccccab1..347a44f32 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java +++ b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java @@ -54,10 +54,10 @@ public class AppTest { paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 // paramMap.put("shopName","百丽");//门店名称 - paramMap.put("userNumber","564603843541262336");//***会员Id + paramMap.put("userNumber","516625539215818752");//***会员Id // paramMap.put("userPhone","18872592633");//会员手机号 - paramMap.put("timeEnd","2021-06-16 15:28:00");//***付款时间(yyyy-MM-dd HH:mm:ss) - paramMap.put("amount","1000");//***付款金额(分) + paramMap.put("timeEnd","2021-07-20 14:18:00");//***付款时间(yyyy-MM-dd HH:mm:ss) + paramMap.put("amount","1800");//***付款金额(分) // paramMap.put("summary","");//付款摘要 /** diff --git a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java index 4e138fee0..34d5bcdb7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java @@ -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); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java index 75586aeee..46110f135 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java @@ -168,8 +168,16 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe } wxBusinessCircleOrderMapper.insertNoticeOrder(record); + Integer creditNum = 0; if(record.getCUserId() != null){ + + 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(); @@ -199,12 +207,6 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe 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()); - } - if(StringUtils.isNotBlank(record.getNoticeId())){ //同步积分 wxCallBackService.notifyPoints(record); 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 9b1f26da2..1646196b5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java @@ -176,6 +176,13 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService 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(); @@ -205,12 +212,6 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService 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); }