From 425aebf60198bd9ce1eb5a3886ece6ce9b07399e Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Thu, 28 Aug 2025 12:01:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LakalaPayServiceImpl.java    | 29 ++++++++++++++-----
 .../impl/ShopStoreBaseServiceImpl.java        |  3 +-
 pom.xml                                       |  2 +-
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/LakalaPayServiceImpl.java b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/LakalaPayServiceImpl.java
index 15ae7aec..05386611 100644
--- a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/LakalaPayServiceImpl.java
+++ b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/LakalaPayServiceImpl.java
@@ -9,8 +9,10 @@
 package com.suisung.mall.pay.service.impl;
 
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.ijpay.core.kit.IpKit;
@@ -260,13 +262,26 @@ public class LakalaPayServiceImpl implements LakalaPayService {
             reqData.put("acc_busi_fields", accBusiFields);
 
             // 分账信息
-            JSONObject outSplitInfo = new JSONObject();
-            outSplitInfo.put("out_sub_trade_no", orderId + "F"); // 子订单号
-            outSplitInfo.put("merchant_no", agentMerchantNo); // 分账商户号
-            outSplitInfo.put("term_no", agentTermNo); // 分账终端号
-            outSplitInfo.put("amount", agentAmount); // 分账金额
-            outSplitInfo.put("settle_type", "0"); // "0"或者空，常规结算方式
-            outSplitInfo.put("sub_remark", "收取订单运费"); // 子单备注信息
+            JSONObject goodsSplitInfo = new JSONObject();
+            goodsSplitInfo.put("out_sub_trade_no", orderId + "-1"); // 子订单号
+            goodsSplitInfo.put("merchant_no", merchantNo); // 分账商户号
+            goodsSplitInfo.put("term_no", termNo); // 分账终端号
+            int totalAmountInt = Convert.toInt(totalAmount) - Convert.toInt(agentAmount);
+            goodsSplitInfo.put("amount", Convert.toStr(totalAmountInt)); // 分账金额
+            goodsSplitInfo.put("settle_type", "0"); // "0"或者空，常规结算方式
+            goodsSplitInfo.put("sub_remark", "商品订单金额"); // 子单备注信息
+
+            JSONObject deliverySplitInfo = new JSONObject();
+            deliverySplitInfo.put("out_sub_trade_no", orderId + "-2"); // 子订单号
+            deliverySplitInfo.put("merchant_no", agentMerchantNo); // 分账商户号
+            deliverySplitInfo.put("term_no", agentTermNo); // 分账终端号
+            deliverySplitInfo.put("amount", agentAmount); // 分账金额
+            deliverySplitInfo.put("settle_type", "0"); // "0"或者空，常规结算方式
+            deliverySplitInfo.put("sub_remark", "运费金额"); // 子单备注信息
+
+            JSONArray outSplitInfo = new JSONArray();
+            outSplitInfo.add(deliverySplitInfo);
+            outSplitInfo.add(goodsSplitInfo);
             reqData.put("out_split_info", outSplitInfo);
 
             // 5. 构造请求体
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
index 585d58f7..2db47e5a 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
@@ -3145,8 +3145,7 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl<ShopStoreBaseMappe
                 return Pair.of(0, "店铺名称已存在，请使用另一名称");
 
             }
-
-
+            
             // 新增 shop_store_base，shop_store_info，shop_store_company, shop_store_employee 待补充
 
             // shop_store_base
diff --git a/pom.xml b/pom.xml
index 86c97f9d..053cd552 100644
--- a/pom.xml
+++ b/pom.xml
@@ -550,7 +550,7 @@
 <!--                        <baseImage>openjdk:8-jre-alpine</baseImage>-->
                         <baseImage>openjdk:8-jre</baseImage>
                         <!--定义容器启动命令，注意不能换行-->
-                        <entryPoint>["java", "-jar", "-Xms128m", "-Xmx512m", "-XX:MetaspaceSize=128m", "-XX:MaxMetaspaceSize=256m", "-XX:+UseContainerSupport", "-XX:MaxRAMPercentage=60.0", "-XX:+UseSerialGC", "-XX:MinHeapFreeRatio=40", "-XX:MaxHeapFreeRatio=60", "-Dspring.profiles.active=${spring.profile}", "-Duser.timezone=Asia/Shanghai", "/${project.build.finalName}.jar"]
+                        <entryPoint>["java", "-jar", "-Xms256m", "-Xmx512m", "-XX:MetaspaceSize=256m", "-XX:MaxMetaspaceSize=256m", "-XX:+UseContainerSupport", "-XX:MaxRAMPercentage=60.0", "-XX:+UseSerialGC", "-XX:MinHeapFreeRatio=40", "-XX:MaxHeapFreeRatio=60", "-Dspring.profiles.active=${spring.profile}", "-Duser.timezone=Asia/Shanghai", "/${project.build.finalName}.jar"]
                         </entryPoint>
 
                         <!--推送镜像仓库校验安全证书，无安全证书无法推送-->