From 7c2234b1a90f0a5c54099515c9a5aec47ddcde03 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Fri, 10 Sep 2021 15:54:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E6=B3=A8=E8=A7=A3=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9B=20=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../connect/entity/enums/ConnectEnum.java     |  2 +-
 .../serviceimpl/AfterSaleServiceImpl.java     |  4 +-
 .../kit/plugin/wechat/WechatPlugin.java       | 41 +++++++++++++------
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/connect/entity/enums/ConnectEnum.java b/framework/src/main/java/cn/lili/modules/connect/entity/enums/ConnectEnum.java
index 1103a9c8..04d17aab 100644
--- a/framework/src/main/java/cn/lili/modules/connect/entity/enums/ConnectEnum.java
+++ b/framework/src/main/java/cn/lili/modules/connect/entity/enums/ConnectEnum.java
@@ -13,8 +13,8 @@ public enum ConnectEnum {
      */
     QQ("QQ登录"),
     WEIBO("微博联合登录"),
-    WECHAT("微信联合登录"),
     //只存放unionid
+    WECHAT("微信联合登录"),
     WECHAT_OPEN_ID("微信openid登录"),
     WECHAT_MP_OPEN_ID("微信openid登录"),
     ALIPAY("支付宝登录"),
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java
index ad023ae2..76b51b4d 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java
@@ -274,9 +274,9 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
 
     @Override
     @AfterSaleLogPoint(sn = "#afterSaleSn", description = "'售后-商家收货:单号['+#afterSaleSn+']，物流单号为['+#logisticsNo+']" +
-            ",处理结果['+serviceStatus='PASS'?+'商家收货':'商家拒收'+']'")
+            ",处理结果['+serviceStatus='PASS'?'商家收货':'商家拒收'+']'")
     @SystemLogPoint(description = "售后-商家收货", customerLog = "'售后-商家收货:单号['+#afterSaleSn+']，物流单号为['+#logisticsNo+']" +
-            ",处理结果['+serviceStatus='PASS'?+'商家收货':'商家拒收'+']'")
+            ",处理结果['+serviceStatus='PASS'?'商家收货':'商家拒收'+']'")
     public AfterSale storeConfirm(String afterSaleSn, String serviceStatus, String remark) {
         //根据售后单号获取售后单
         AfterSale afterSale = OperationalJudgment.judgment(this.getBySn(afterSaleSn));
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java
index 5902e630..54b0836b 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java
@@ -552,23 +552,38 @@ public class WechatPlugin implements Payment {
         String result = HttpKit.readData(request);
         log.info("微信退款通知密文 {}", result);
         JSONObject ciphertext = JSONUtil.parseObj(result);
-        if (!("REFUND.SUCCESS").equals(ciphertext.getStr("event_type"))) {
-            return;
-        }
-        try {
-            //校验服务器端响应¬
+
+        try { //校验服务器端响应¬
             String plainText = WxPayKit.verifyNotify(serialNo, result, signature, nonce, timestamp,
                     wechatPaymentSetting().getApiKey3(), Objects.requireNonNull(getPlatformCert()));
             log.info("微信退款通知明文 {}", plainText);
-            JSONObject jsonObject = JSONUtil.parseObj(plainText);
-            String transactionId = jsonObject.getStr("transaction_id");
-            String refundId = jsonObject.getStr("refund_id");
 
-            RefundLog refundLog = refundLogService.getOne(new LambdaQueryWrapper<RefundLog>().eq(RefundLog::getPaymentReceivableNo, transactionId));
-            if (refundLog != null) {
-                refundLog.setIsRefund(true);
-                refundLog.setReceivableNo(refundId);
-                refundLogService.saveOrUpdate(refundLog);
+            if (("REFUND.SUCCESS").equals(ciphertext.getStr("event_type"))) {
+                log.info("退款成功 {}", plainText);
+                //校验服务器端响应
+                JSONObject jsonObject = JSONUtil.parseObj(plainText);
+                String transactionId = jsonObject.getStr("transaction_id");
+                String refundId = jsonObject.getStr("refund_id");
+
+                RefundLog refundLog = refundLogService.getOne(new LambdaQueryWrapper<RefundLog>().eq(RefundLog::getPaymentReceivableNo, transactionId));
+                if (refundLog != null) {
+                    refundLog.setIsRefund(true);
+                    refundLog.setReceivableNo(refundId);
+                    refundLogService.saveOrUpdate(refundLog);
+                }
+
+            } else {
+                log.info("退款失败 {}", plainText);
+                JSONObject jsonObject = JSONUtil.parseObj(plainText);
+                String transactionId = jsonObject.getStr("transaction_id");
+                String refundId = jsonObject.getStr("refund_id");
+
+                RefundLog refundLog = refundLogService.getOne(new LambdaQueryWrapper<RefundLog>().eq(RefundLog::getPaymentReceivableNo, transactionId));
+                if (refundLog != null) {
+                    refundLog.setReceivableNo(refundId);
+                    refundLog.setErrorMessage(ciphertext.getStr("summary"));
+                    refundLogService.saveOrUpdate(refundLog);
+                }
             }
         } catch (Exception e) {
             log.error("微信退款失败", e);