backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合单修改

Browse Source
This commit is contained in:
Jack 2025-08-28 12:01:18 +08:00
parent 5a2f5eff48
commit 425aebf601
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mall-pay/src/main/java/com/suisung/mall/pay/service/impl/LakalaPayServiceImpl.java
View File

@ -9,8 +9,10 @@
package com.suisung.mall.pay.service.impl; package com.suisung.mall.pay.service.impl;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.ijpay.core.kit.IpKit; import com.ijpay.core.kit.IpKit;
@ -260,13 +262,26 @@ public class LakalaPayServiceImpl implements LakalaPayService {
reqData.put("acc_busi_fields", accBusiFields); reqData.put("acc_busi_fields", accBusiFields);
// 分账信息 // 分账信息
JSONObject outSplitInfo = new JSONObject(); JSONObject goodsSplitInfo = new JSONObject();
outSplitInfo.put("out_sub_trade_no", orderId + "F"); // 子订单号 goodsSplitInfo.put("out_sub_trade_no", orderId + "-1"); // 子订单号
outSplitInfo.put("merchant_no", agentMerchantNo); // 分账商户号 goodsSplitInfo.put("merchant_no", merchantNo); // 分账商户号
outSplitInfo.put("term_no", agentTermNo); // 分账终端号 goodsSplitInfo.put("term_no", termNo); // 分账终端号
outSplitInfo.put("amount", agentAmount); // 分账金额 int totalAmountInt = Convert.toInt(totalAmount) - Convert.toInt(agentAmount);
outSplitInfo.put("settle_type", "0"); // "0"或者空，常规结算方式 goodsSplitInfo.put("amount", Convert.toStr(totalAmountInt)); // 分账金额
outSplitInfo.put("sub_remark", "收取订单运费"); // 子单备注信息 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); reqData.put("out_split_info", outSplitInfo);
// 5. 构造请求体 // 5. 构造请求体

1
mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
View File

@ -3146,7 +3146,6 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl<ShopStoreBaseMappe
} }
// 新增 shop_store_base，shop_store_info，shop_store_company, shop_store_employee 待补充 // 新增 shop_store_base，shop_store_info，shop_store_company, shop_store_employee 待补充
// shop_store_base // shop_store_base

2
pom.xml
View File

@ -550,7 +550,7 @@
<!-- <baseImage>openjdk:8-jre-alpine</baseImage>--> <!-- <baseImage>openjdk:8-jre-alpine</baseImage>-->
<baseImage>openjdk:8-jre</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> </entryPoint>
<!--推送镜像仓库校验安全证书，无安全证书无法推送--> <!--推送镜像仓库校验安全证书，无安全证书无法推送-->