From f16efdd8b9fe595d911f411b6b0b08b3b085fe36 Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Sat, 27 Sep 2025 12:27:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=89=E6=96=B0=E8=AE=A2=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=EF=BC=8C=E4=B8=8D=E7=BB=99=E5=95=86=E5=AE=B6?=
 =?UTF-8?q?=E5=8F=91=E7=9F=AD=E4=BF=A1=E4=BA=86=EF=BC=8C=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E6=89=93=E6=89=B0=E5=95=86=E5=AE=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lakala/service/impl/LakalaApiServiceImpl.java    |  8 +++++---
 .../order/service/impl/ShopOrderBaseServiceImpl.java | 12 ++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java
index ab640bfc..78ddc55d 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java
@@ -2824,10 +2824,12 @@ public class LakalaApiServiceImpl implements LakalaApiService {
             // RMK 本次分账成功后，给商户和接收方 D1提现到银行卡
             if (CollUtil.isNotEmpty(detailDatas)) {
                 for (JSONObject detailData : detailDatas.jsonIter()) {
-                    String recvNo = detailData.getStr("recv_no"); // 822商户号或接收方号
-                    String amt = detailData.getStr("amt"); // 单位（分）
+                    String recvNo = detailData.getStr("recv_no");
+                    String amt = detailData.getStr("amt");
                     if (StrUtil.isNotBlank(recvNo) && StrUtil.isNotBlank(amt)) {
-                        ewalletWithDrawD1(recvNo, outSeparateNo, amt, JSONUtil.toJsonStr(detailDatas));
+                        Boolean drawSuccess = ewalletWithDrawD1(recvNo, outSeparateNo, amt, JSONUtil.toJsonStr(detailDatas));
+                        log.info("[拉卡拉分账通知] 账户D1提现{}，商户号={}，分账单号={}，金额={}分",
+                                Boolean.TRUE.equals(drawSuccess) ? "成功" : "失败", recvNo, outSeparateNo, amt);
                     }
                 }
             }
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
index 6812c641..fc71150d 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
@@ -3236,11 +3236,11 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
                     }
 
                     // 2024-12-10 add
-                    Map<String, Object> tmplArgs = new HashMap<>(2);
-                    tmplArgs.put("order_id", order_id);
-                    tmplArgs.put("order_payment_amount", order_payment_amount);
+                    //  Map<String, Object> tmplArgs = new HashMap<>(2);
+                    // tmplArgs.put("order_id", order_id);
+                    // tmplArgs.put("order_payment_amount", order_payment_amount);
                     // 所有店铺管理员的发送邮件， 提醒商家：您有一笔新的订单 ${order_id}，请及时处理。
-                    shopMessageTemplateService.aliyunSmsSend(shopKeeperMobiles, "SMS_476810378", tmplArgs);//SMS_475836097
+                    // shopMessageTemplateService.aliyunSmsSend(shopKeeperMobiles, "SMS_476810378", tmplArgs);
                 }
 
                 // 付款成功，对通知推广员进行提醒
@@ -4220,7 +4220,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
                     if (!shopProductItemService.edit(shopProductItem)) {
                         throw new ApiException(String.format(I18nUtil._("释放: %s 冻结库存失败!"), order_item_row.getItem_id()));
                     }
-                    log.debug("释放库存Item_src_id:{},数量：{}",shopProductItem.getItem_src_id(),order_item_quantity);
+                    log.debug("释放库存Item_src_id:{},数量：{}", shopProductItem.getItem_src_id(), order_item_quantity);
                     // RMK 第三方数据同步相关：redis 给这个商品加上对应的库存
                     Map<String, Integer> stockDeltaMap = new HashMap<>();
                     stockDeltaMap.put(Convert.toStr(shopProductItem.getItem_src_id()), order_item_quantity);
@@ -7234,7 +7234,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
                                 }
 
                                 // RMK 第三方数据同步相关：redis 给这个商品减去上对应的库存
-                                log.debug("减库存Item_src_id:{},数量：{}",item_src_id,cart_quantity);
+                                log.debug("减库存Item_src_id:{},数量：{}", item_src_id, cart_quantity);
                                 Map<String, Integer> stockDeltaMap = new HashMap<>();
                                 stockDeltaMap.put(Convert.toStr(item_src_id), -cart_quantity);
                                 syncThirdDataService.incrProductStockToRedis(stockDeltaMap);