From 48c5ca79055dc2e0244a6b3fa5828254abf003c8 Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Mon, 3 Feb 2025 17:57:33 +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

---
 .../mall/pay/service/impl/LakalaServiceImpl.java   |  3 ++-
 .../service/impl/PayConsumeDepositServiceImpl.java |  5 +++++
 .../pay/service/impl/PayUserPayServiceImpl.java    | 14 +++++++-------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/LakalaServiceImpl.java b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/LakalaServiceImpl.java
index dadc41fa..2588a808 100644
--- a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/LakalaServiceImpl.java
+++ b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/LakalaServiceImpl.java
@@ -49,7 +49,7 @@ public class LakalaServiceImpl implements LakalaService {
     @Value("${lakala.lkl_platform_cer_path}")
     private String lklNotifyCerPath; //拉卡拉支付平台证书地址2(用于拉卡拉通知验签)
 
-    // 可选的两个参数
+    //### 可选的两个参数，不同的店铺商家，可以数据库里配置不同的商户号和终端号
     @Value("${lakala.merchant_no}")
     public String merchantNo; // 拉卡拉分配的商户号
     @Value("${lakala.term_no}")
@@ -148,6 +148,7 @@ public class LakalaServiceImpl implements LakalaService {
         // 41:NATIVE（（ALIPAY，云闪付支持，京东白条分期）51:JSAPI（微信公众号支付，支付宝服务窗支付，银联JS支付，翼支付JS支付、拉卡拉钱包支付）71:微信小程序支付 61:APP支付（微信APP支付）
         v3LabsTransPreorderWechatReq.setTransType("51");
         v3LabsTransPreorderWechatReq.setTotalAmount(totalAmount);
+        v3LabsTransPreorderWechatReq.setSettleType("1"); //“0”或者空，常规结算方式，如需接拉卡拉分账通需传“1”，商户未开通分账之前切记不用上送此参数。；
         v3LabsTransPreorderWechatReq.setNotifyUrl(notifyURL);
         v3LabsTransPreorderWechatReq.setRemark(remark);
 
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 a8a1369a..ec6a81ac 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
@@ -193,10 +193,15 @@ public class PayConsumeDepositServiceImpl extends BaseServiceImpl<PayConsumeDepo
     public boolean processDeposit(PayConsumeDeposit notify_row, BigDecimal money,
                                   BigDecimal recharge_card, BigDecimal points,
                                   BigDecimal credit, BigDecimal redpack) {
+        if (ObjectUtil.isEmpty(notify_row)) {
+            throw new ApiException(ResultCode.FAILED);
+        }
 
         String order_id = notify_row.getOrder_id();
         String deposit_trade_no = notify_row.getDeposit_trade_no();
 
+        notify_row.setDeposit_subject(StrUtil.trim(notify_row.getDeposit_subject()));
+
         QueryWrapper<PayConsumeDeposit> deposit_column_row = new QueryWrapper<>();
         deposit_column_row.eq("order_id", order_id);
 
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 3c085b0c..d17f919b 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
@@ -1297,8 +1297,8 @@ public class PayUserPayServiceImpl extends BaseServiceImpl<PayUserPayMapper, Pay
             String orderSubject = "";
             Integer userId = 0;
             // 交易模式  2直接交易:商家直接收款； 1担保交易：平台收款，平台和商家结算。
-//            if (!accountBaseConfigService.getTradeModePlantform()) {
-            // 不可以联合支付。
+            // if (!accountBaseConfigService.getTradeModePlantform()) {
+            //不可以联合支付。
             QueryWrapper<PayConsumeTrade> tradeQueryWrapper = new QueryWrapper<>();
             tradeQueryWrapper.eq("order_id", order_id);
             PayConsumeTrade trade_row_tmp = payConsumeTradeService.findOne(tradeQueryWrapper);
@@ -1308,7 +1308,7 @@ public class PayUserPayServiceImpl extends BaseServiceImpl<PayUserPayMapper, Pay
                 orderSubject = trade_row_tmp.getTrade_title();
                 userId = trade_row_tmp.getBuyer_id();
             }
-//            }
+            //}
 
             QueryWrapper<PayPaymentChannel> channelQueryWrapper = new QueryWrapper<>();
             channelQueryWrapper.eq("payment_channel_code", "lakala");
@@ -1316,7 +1316,6 @@ public class PayUserPayServiceImpl extends BaseServiceImpl<PayUserPayMapper, Pay
             Integer payment_channel_id = payPaymentChannel.getPayment_channel_id();
 
             // 插入充值记录
-
             PayConsumeDeposit notify_row = createNotify(params, payPaymentChannel);
             notify_row.setOrder_id(order_id);
             notify_row.setStore_id(payment_store_id); // 所属店铺
@@ -1325,8 +1324,9 @@ public class PayUserPayServiceImpl extends BaseServiceImpl<PayUserPayMapper, Pay
             notify_row.setDeposit_subject(orderSubject);
             notify_row.setDeposit_body(orderSubject);
             notify_row.setUser_id(userId);
-            notify_row.setDeposit_async(1); // 是否同步:0-同步; 1-异步回调使用
-            notify_row.setDeposit_state(1);// 支付状态:0-默认; 1-接收正确数据处理完逻辑; 9-异常订单
+            //      notify_row.setDeposit_state(1);// 支付状态:0-默认; 1-接收正确数据处理完逻辑; 9-异常订单
+//            notify_row.setDeposit_async(0); // 是否同步:0-同步; 1-异步回调使用
+
 
             BigDecimal zero = BigDecimal.ZERO;
 
@@ -1350,7 +1350,7 @@ public class PayUserPayServiceImpl extends BaseServiceImpl<PayUserPayMapper, Pay
                 throw new ApiException(e.getMessage());
             }
 
-            return lklNotifyMsg(true, "");
+            return lklNotifyMsg(true, "执行成功");
 
         } catch (Exception e) {
             logger.error("通知处理发生异常：" + e.getMessage() + "， {}", e);