From b9f4325c519b8b88aecc677696f21bdd2fd9c238 Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Tue, 28 Jan 2025 20:39:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=89=E5=8D=A1=E6=8B=89=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayConsumeDepositServiceImpl.java    |  2 +-
 .../service/impl/PayUserPayServiceImpl.java   | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayConsumeDepositServiceImpl.java b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayConsumeDepositServiceImpl.java
index bf7aea60..a8a1369a 100644
--- a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayConsumeDepositServiceImpl.java
+++ b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayConsumeDepositServiceImpl.java
@@ -203,7 +203,7 @@ public class PayConsumeDepositServiceImpl extends BaseServiceImpl<PayConsumeDepo
         PayConsumeDeposit deposit_row = getOne(deposit_column_row);
 
         if (deposit_row == null) {
-            log.info("#####PayConsumeDeposit:{}#####", notify_row);
+//            log.info("#####PayConsumeDeposit:{}#####", notify_row);
             // 增加充值信息
             if (!saveOrUpdate(notify_row)) {
                 throw new ApiException(ResultCode.FAILED);
diff --git a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayUserPayServiceImpl.java b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayUserPayServiceImpl.java
index 1b44bef3..1e922d94 100644
--- a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayUserPayServiceImpl.java
+++ b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayUserPayServiceImpl.java
@@ -1271,7 +1271,7 @@ public class PayUserPayServiceImpl extends BaseServiceImpl<PayUserPayMapper, Pay
             if(StrUtil.isBlank(order_id)){
                 order_id = params.getOrDefault("out_trade_no","");
             }
-            logger.debug("支付回调 params 数据：{}", params);
+//            logger.debug("支付回调 params 数据：{}", params);
 
             String authorization = request.getHeader("Authorization");
 //            logger.debug("支付回调 Authorization 数据：{}", authorization);
@@ -1284,14 +1284,17 @@ public class PayUserPayServiceImpl extends BaseServiceImpl<PayUserPayMapper, Pay
             // 判断是门店 店铺 平台
             Integer payment_store_id = 0;
             Integer payment_chain_id = 0;
+            String orderSubject ="";
             if (!accountBaseConfigService.getTradeModePlantform()) {
                 // 不可以联合支付。
                 QueryWrapper<PayConsumeTrade> tradeQueryWrapper = new QueryWrapper<>();
                 tradeQueryWrapper.eq("order_id", order_id);
                 PayConsumeTrade trade_row_tmp = payConsumeTradeService.findOne(tradeQueryWrapper);
 
-                // 固定死， 是门店收银还是店铺收银。， 统一店铺收银
-                payment_store_id = trade_row_tmp.getStore_id();
+                if(trade_row_tmp!=null) {
+                    payment_store_id = trade_row_tmp.getStore_id();
+                    orderSubject = trade_row_tmp.getTrade_title();
+                }
             }
 
             QueryWrapper<PayPaymentChannel> channelQueryWrapper = new QueryWrapper<>();
@@ -1306,6 +1309,8 @@ public class PayUserPayServiceImpl extends BaseServiceImpl<PayUserPayMapper, Pay
             notify_row.setStore_id(payment_store_id); // 所属店铺
             notify_row.setChain_id(payment_chain_id); // 所属门店
             notify_row.setPayment_channel_id(payment_channel_id);
+            notify_row.setDeposit_subject(orderSubject);
+            notify_row.setDeposit_body(orderSubject);
 
             BigDecimal zero = BigDecimal.ZERO;
 
@@ -1332,8 +1337,8 @@ public class PayUserPayServiceImpl extends BaseServiceImpl<PayUserPayMapper, Pay
             return lklNotifyMsg(true, "");
 
         } catch (Exception e) {
-            logger.error("验签发生异常：" + e.getMessage() + "， {}", e);
-            return lklNotifyMsg(false, "验签发生异常！");
+            logger.error("通知处理发生异常：" + e.getMessage() + "， {}", e);
+            return lklNotifyMsg(false, "通知处理发生异常！");
         }
     }
 
@@ -1522,6 +1527,9 @@ public class PayUserPayServiceImpl extends BaseServiceImpl<PayUserPayMapper, Pay
         notify_row.setDeposit_total_fee(deposit_total_fee);
         notify_row.setDeposit_price(BigDecimal.ZERO);
         notify_row.setDeposit_buyer_id(params.get("user_id2"));// openid
+//        notify_row.setDeposit_body();
+//        notify_row.setDeposit_subject();
+        notify_row.setDeposit_gmt_create(deposit_gmt_payment);
         notify_row.setDeposit_gmt_payment(deposit_gmt_payment);
         notify_row.setDeposit_service("JSAPI");
         notify_row.setDeposit_sign(deposit_sign);
@@ -1530,6 +1538,7 @@ public class PayUserPayServiceImpl extends BaseServiceImpl<PayUserPayMapper, Pay
         notify_row.setPayment_channel_id(payment_channel_id);
 
         notify_row.setDeposit_payment_type(StateCode.PAYMENT_TYPE_ONLINE);
+
         notify_row.setDeposit_notify_time(new Date());
     }