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-10-18 10:12:16 +08:00
parent 4774ab8aab
commit b7701a8685
7 changed files with 93 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mall-common/src/main/java/com/suisung/mall/common/pojo/dto/LklSeparateWithTotalAmountDTO.java
View File

@ -62,7 +62,7 @@ public class LklSeparateWithTotalAmountDTO {
// 测试用例1: 所有参与方都参与分账（符合比例要求） // 测试用例1: 所有参与方都参与分账（符合比例要求）
System.out.println("=== 测试用例1: 所有参与方都参与分账 ==="); System.out.println("=== 测试用例1: 所有参与方都参与分账 ===");
LklSeparateWithTotalAmountDTO dto1 = new LklSeparateWithTotalAmountDTO(); LklSeparateWithTotalAmountDTO dto1 = new LklSeparateWithTotalAmountDTO();
dto1.setTotalSeparateAmount(5500); // 总金额100元(10000分) dto1.setTotalSeparateAmount(1696); // 总金额100元(10000分)
dto1.setShippingFee(500); dto1.setShippingFee(500);
// dto1.setRefCanSeparateAmount(1496); // dto1.setRefCanSeparateAmount(1496);
dto1.setLklRatio(new BigDecimal("0.0025")); // 拉卡拉分账比例0.25% dto1.setLklRatio(new BigDecimal("0.0025")); // 拉卡拉分账比例0.25%

3
mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/LakalaApiService.java
View File

@ -208,9 +208,10 @@ public interface LakalaApiService {
* @param lklMerchantNo 拉卡拉商户号 * @param lklMerchantNo 拉卡拉商户号
* @param receiveTradeNo 收货交易号（对应拉卡拉的trade_no） * @param receiveTradeNo 收货交易号（对应拉卡拉的trade_no）
* @param receiveLogNo 收货流水号（对应拉卡拉的log_no） * @param receiveLogNo 收货流水号（对应拉卡拉的log_no）
* @param logDate posp日期，yyyyMMdd，查清结算用, 一般是值交易完成日期（确认收货的日期）
* @return Pair<Boolean, String> 处理结果对，first为是否成功，second为结果描述信息 * @return Pair<Boolean, String> 处理结果对，first为是否成功，second为结果描述信息
*/ */
Pair<Boolean, String> innerDoOrderSeparateByMerchantAndLogNo(String lklMerchantNo, String receiveTradeNo, String receiveLogNo); Pair<Boolean, String> innerDoOrderSeparateByMerchantAndLogNo(String lklMerchantNo, String receiveTradeNo, String receiveLogNo, String logDate);
/** /**
* 分账结果通知 * 分账结果通知

26
mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java
View File

@ -11,6 +11,7 @@ package com.suisung.mall.shop.lakala.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateUtil;
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.JSONArray;
@ -823,7 +824,15 @@ public class LakalaApiServiceImpl implements LakalaApiService {
// 分账用途 // 分账用途
String logNo = paramsJSON.getStr("log_no"); String logNo = paramsJSON.getStr("log_no");
String tradeNo = paramsJSON.getStr("trade_no"); String tradeNo = paramsJSON.getStr("trade_no");
log.debug("[确认收货通知] 获取基础交易信息: logNo={} tradeNo={}", logNo, tradeNo); String tradeTime = paramsJSON.getStr("trade_time"); // 实际交易完成时间。yyyyMMddHHmmss
// 直接截取前8位，获取日期部分
String logDate = tradeTime != null && tradeTime.length() >= 8 ? tradeTime.substring(0, 8) : null;
if (logDate == null) {
logDate = DateUtil.format(new Date(), "yyyyMMdd"); // 当前时间
}
log.debug("[确认收货通知] 获取基础交易信息: logNo={} tradeNo={} logDate={}", logNo, tradeNo, logDate);
// 查询用途 // 查询用途
String originTradeNo = paramsJSON.getStr("origin_trade_no"); String originTradeNo = paramsJSON.getStr("origin_trade_no");
@ -900,7 +909,7 @@ public class LakalaApiServiceImpl implements LakalaApiService {
// 重要：准备发起分账指令 // 重要：准备发起分账指令
log.info("[确认收货通知] 开始发起分账指令: merchantNo={}, receiveTradeNo={}, logNo={}", log.info("[确认收货通知] 开始发起分账指令: merchantNo={}, receiveTradeNo={}, logNo={}",
merchantNo, shopOrderLkl.getLkl_receive_trade_no(), logNo); merchantNo, shopOrderLkl.getLkl_receive_trade_no(), logNo);
Pair<Boolean, String> separateResult = innerDoOrderSeparateByMerchantAndLogNo(merchantNo, shopOrderLkl.getLkl_receive_trade_no(), shopOrderLkl.getLkl_receive_log_no()); Pair<Boolean, String> separateResult = innerDoOrderSeparateByMerchantAndLogNo(merchantNo, shopOrderLkl.getLkl_receive_trade_no(), shopOrderLkl.getLkl_receive_log_no(), logDate);
if (!separateResult.getFirst()) { if (!separateResult.getFirst()) {
shopOrderLkl.setSeparate_msg(separateResult.getSecond()); shopOrderLkl.setSeparate_msg(separateResult.getSecond());
@ -2451,15 +2460,16 @@ public class LakalaApiServiceImpl implements LakalaApiService {
* @param lklMerchantNo 拉卡拉商户号 * @param lklMerchantNo 拉卡拉商户号
* @param receiveTradeNo 收货交易号（对应拉卡拉的trade_no） * @param receiveTradeNo 收货交易号（对应拉卡拉的trade_no）
* @param receiveLogNo 收货流水号（对应拉卡拉的log_no） * @param receiveLogNo 收货流水号（对应拉卡拉的log_no）
* @param logDate posp日期，yyyyMMdd，查清结算用, 一般是值交易完成日期（确认收货的日期）
* @return Pair<Boolean, String> 处理结果对，first为是否成功，second为结果描述信息 * @return Pair<Boolean, String> 处理结果对，first为是否成功，second为结果描述信息
*/ */
@Transactional @Transactional
@Override @Override
public Pair<Boolean, String> innerDoOrderSeparateByMerchantAndLogNo(String lklMerchantNo, String receiveTradeNo, String receiveLogNo) { public Pair<Boolean, String> innerDoOrderSeparateByMerchantAndLogNo(String lklMerchantNo, String receiveTradeNo, String receiveLogNo, String logDate) {
// 1. 输入参数校验 // 1. 输入参数校验
if (StrUtil.hasBlank(lklMerchantNo, receiveTradeNo, receiveLogNo)) { if (StrUtil.hasBlank(lklMerchantNo, receiveTradeNo, receiveLogNo, logDate)) {
log.warn("[分账操作] 参数校验失败：缺少必要参数, lklMerchantNo={}, receiveTradeNo={}, receiveLogNo={}", log.warn("[分账操作] 参数校验失败：缺少必要参数, lklMerchantNo={}, receiveTradeNo={}, receiveLogNo={}, logDate={}",
lklMerchantNo, receiveTradeNo, receiveLogNo); lklMerchantNo, receiveTradeNo, receiveLogNo, logDate);
return Pair.of(false, "缺少必要参数"); return Pair.of(false, "缺少必要参数");
} }
@ -2639,7 +2649,7 @@ public class LakalaApiServiceImpl implements LakalaApiService {
receiver.setSeparateValue(Convert.toStr(merchantAmount)); receiver.setSeparateValue(Convert.toStr(merchantAmount));
recvDatas.add(receiver); recvDatas.add(receiver);
} }
// 是否有二级代理商？ // 是否有二级代理商？
boolean has2ndAgent = CheckUtil.isNotEmpty(agent2ndSplitRatio) && agent2ndReceiver != null && boolean has2ndAgent = CheckUtil.isNotEmpty(agent2ndSplitRatio) && agent2ndReceiver != null &&
StrUtil.isNotBlank(agent2ndReceiver.getReceiver_no()) && StrUtil.isNotBlank(agent2ndReceiver.getReceiver_no()) &&
@ -2695,7 +2705,7 @@ public class LakalaApiServiceImpl implements LakalaApiService {
separateRequest.setMerchantNo(merchantNo); separateRequest.setMerchantNo(merchantNo);
separateRequest.setOutSeparateNo(shopOrderLkl.getOut_separate_no()); separateRequest.setOutSeparateNo(shopOrderLkl.getOut_separate_no());
separateRequest.setLogNo(shopOrderLkl.getLkl_receive_log_no()); // 使用确认收货流水号作为分账流水号 separateRequest.setLogNo(shopOrderLkl.getLkl_receive_log_no()); // 使用确认收货流水号作为分账流水号
separateRequest.setLogDate(shopOrderLkl.getLkl_log_date()); separateRequest.setLogDate(logDate); // 重要：确认收货后的交易时间
separateRequest.setTotalAmt(refCanSeparateAmt.toString()); separateRequest.setTotalAmt(refCanSeparateAmt.toString());
separateRequest.setLklOrgNo(orgCode); separateRequest.setLklOrgNo(orgCode);
separateRequest.setCalType("0"); // 0- 按照指定金额，1- 按照指定比例。默认 0 separateRequest.setCalType("0"); // 0- 按照指定金额，1- 按照指定比例。默认 0

8
mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderLklServiceImpl.java
View File

@ -519,11 +519,11 @@ public class ShopOrderLklServiceImpl extends BaseServiceImpl<ShopOrderLklMapper,
* *
* @param lklReceiveLogNo 拉卡拉确认收货对账单流水号 * @param lklReceiveLogNo 拉卡拉确认收货对账单流水号
* @param separateStatus 分账状态：1-已分账；2-未分账；3-分账已失败； * @param separateStatus 分账状态：1-已分账；2-未分账；3-分账已失败；
* @param separateRemark 分账问题备注； * @param separateMsg 分账问题备注；
* @return 更新结果 true-成功 false-失败 * @return 更新结果 true-成功 false-失败
*/ */
@Override @Override
public Boolean updateSeparateStatusByReceiveLogNo(String lklReceiveLogNo, Integer separateStatus, String separateRemark) { public Boolean updateSeparateStatusByReceiveLogNo(String lklReceiveLogNo, Integer separateStatus, String separateMsg) {
// 检查参数是否全部为空 // 检查参数是否全部为空
if (StringUtils.isBlank(lklReceiveLogNo) || separateStatus == null) { if (StringUtils.isBlank(lklReceiveLogNo) || separateStatus == null) {
log.warn("[更新分账状态] 参数校验失败：缺少必要参数, lklReceiveLogNo={}, separateStatus={}", lklReceiveLogNo, separateStatus); log.warn("[更新分账状态] 参数校验失败：缺少必要参数, lklReceiveLogNo={}, separateStatus={}", lklReceiveLogNo, separateStatus);
@ -536,8 +536,8 @@ public class ShopOrderLklServiceImpl extends BaseServiceImpl<ShopOrderLklMapper,
UpdateWrapper<ShopOrderLkl> updateWrapper = new UpdateWrapper<>(); UpdateWrapper<ShopOrderLkl> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("lkl_receive_log_no", lklReceiveLogNo); updateWrapper.eq("lkl_receive_log_no", lklReceiveLogNo);
updateWrapper.set("separate_status", separateStatus); updateWrapper.set("separate_status", separateStatus);
if (StrUtil.isNotBlank(separateRemark)) { if (StrUtil.isNotBlank(separateMsg)) {
updateWrapper.set("separate_remark", separateRemark); updateWrapper.set("separate_msg", separateMsg);
} }
boolean result = update(updateWrapper); boolean result = update(updateWrapper);

8
mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStoreInfoService.java
View File

@ -20,6 +20,14 @@ public interface ShopStoreInfoService extends IBaseService<ShopStoreInfo> {
Map getStoreInfoById(Integer store_id); Map getStoreInfoById(Integer store_id);
/**
* 根据店铺id获取店铺信息
*
* @param storeId
* @return
*/
ShopStoreInfo getShopStoreInfoByStoreId(Integer storeId);
Map getInfoList(QueryWrapper<ShopStoreInfo> queryWrapper, Integer pageNum, Integer pageSize); Map getInfoList(QueryWrapper<ShopStoreInfo> queryWrapper, Integer pageNum, Integer pageSize);
/** /**

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

@ -80,7 +80,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable; import java.io.Serializable;
@ -176,9 +175,6 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl<ShopStoreBaseMappe
@Autowired @Autowired
private ShopPageModuleService shopPageModuleService; private ShopPageModuleService shopPageModuleService;
@Lazy @Lazy
@Resource
private ShopStoreSameCityTransportBaseService storeSameCityTransportBaseService;
@Lazy
@Autowired @Autowired
private ShopMchEntryService shopMchEntryService; private ShopMchEntryService shopMchEntryService;
@Autowired @Autowired
@ -3277,54 +3273,58 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl<ShopStoreBaseMappe
return Pair.of(0, "店铺ID获取失败"); return Pair.of(0, "店铺ID获取失败");
} }
// 创建店铺信息
ShopStoreInfo shopStoreInfo = new ShopStoreInfo();
shopStoreInfo.setStore_id(storeId);
shopStoreInfo.setStore_start_time(DateUtil.date());
shopStoreInfo.setStore_end_time(DateUtil.offsetDay(DateUtil.date(), 365 * 5));
shopStoreInfo.setStore_opening_hours("07:30");
shopStoreInfo.setStore_close_hours("23:00");
shopStoreInfo.setStore_discount(BigDecimal.valueOf(10));
shopStoreInfo.setStore_banner(storeFacadeImage);
// 处理联系人信息 // 处理联系人信息
String contact_mobile = StrUtil.isNotBlank(shopMchEntry.getLegal_person_mobile()) ? String contact_mobile = StrUtil.isNotBlank(shopMchEntry.getLegal_person_mobile()) ?
shopMchEntry.getLegal_person_mobile() : shopMchEntry.getLogin_mobile(); shopMchEntry.getLegal_person_mobile() : shopMchEntry.getLogin_mobile();
shopStoreInfo.setStore_tel(contact_mobile);
shopStoreInfo.setContact_mobile(contact_mobile);
shopStoreInfo.setContact_name(shopMchEntry.getContact_name());
// 构建幻灯片 // 创建店铺信息
JSONArray list = new JSONArray(); ShopStoreInfo shopStoreInfo = shopStoreInfoService.getShopStoreInfoByStoreId(storeId); // new ShopStoreInfo();
if (StrUtil.isNotBlank(storeFacadeImage)) { if (shopStoreInfo == null) {
JSONObject slide = new JSONObject(); shopStoreInfo = new ShopStoreInfo();
slide.put("img", storeFacadeImage); shopStoreInfo.setStore_id(storeId);
slide.put("name", "店铺门面照片"); shopStoreInfo.setStore_start_time(DateUtil.date());
slide.put("check", true); shopStoreInfo.setStore_end_time(DateUtil.offsetDay(DateUtil.date(), 365 * 5));
slide.put("url", "https://www.gpxscs.cn"); shopStoreInfo.setStore_opening_hours("08:00");
list.put(slide); shopStoreInfo.setStore_close_hours("21:30");
} shopStoreInfo.setStore_discount(BigDecimal.valueOf(10));
if (StrUtil.isNotBlank(shopMchEntry.getEnvironment_image())) { shopStoreInfo.setStore_banner(storeFacadeImage);
JSONObject slide = new JSONObject();
slide.put("img", shopMchEntry.getEnvironment_image()); shopStoreInfo.setStore_tel(contact_mobile);
slide.put("name", "店铺环境照片"); shopStoreInfo.setContact_mobile(contact_mobile);
slide.put("check", true); shopStoreInfo.setContact_name(shopMchEntry.getContact_name());
slide.put("url", "https://www.gpxscs.cn");
list.put(slide);
}
shopStoreInfo.setStore_slide(list.toString());
if (shopMchEntry.getStore_address() != null) { // 构建幻灯片
shopStoreInfo.setStore_address(shopMchEntry.getStore_address()); JSONArray list = new JSONArray();
} if (StrUtil.isNotBlank(storeFacadeImage)) {
shopStoreInfo.setStore_state_id(StateCode.STORE_STATE_YES); JSONObject slide = new JSONObject();
slide.put("img", storeFacadeImage);
if (!shopStoreInfoService.save(shopStoreInfo)) { slide.put("name", "店铺门面照片");
logger.error("生成店铺：新增店铺info失败"); slide.put("check", true);
if (Boolean.TRUE.equals(allowThrown)) { slide.put("url", "https://www.gpxscs.cn");
throw new ApiException("新增店铺信息失败"); list.put(slide);
}
if (StrUtil.isNotBlank(shopMchEntry.getEnvironment_image())) {
JSONObject slide = new JSONObject();
slide.put("img", shopMchEntry.getEnvironment_image());
slide.put("name", "店铺环境照片");
slide.put("check", true);
slide.put("url", "https://www.gpxscs.cn");
list.put(slide);
}
shopStoreInfo.setStore_slide(list.toString());
if (shopMchEntry.getStore_address() != null) {
shopStoreInfo.setStore_address(shopMchEntry.getStore_address());
}
shopStoreInfo.setStore_state_id(StateCode.STORE_STATE_YES);
if (!shopStoreInfoService.save(shopStoreInfo)) {
logger.error("生成店铺：新增店铺info失败");
if (Boolean.TRUE.equals(allowThrown)) {
throw new ApiException("新增店铺信息失败");
}
return Pair.of(0, "新增店铺信息失败");
} }
return Pair.of(0, "新增店铺信息失败");
} }
// 创建店铺公司信息 // 创建店铺公司信息
@ -3887,14 +3887,14 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl<ShopStoreBaseMappe
bizState = CommonConstant.Disable2; bizState = CommonConstant.Disable2;
} }
String store_opening_hours=getParameter("store_opening_hours"); String store_opening_hours = getParameter("store_opening_hours");
String store_close_hours=getParameter("store_close_hours"); String store_close_hours = getParameter("store_close_hours");
try { try {
if(StringUtils.isNotEmpty(store_close_hours)){ if (StringUtils.isNotEmpty(store_close_hours)) {
UpdateWrapper<ShopStoreInfo> shopStoreInfoUpdateWrapper=new UpdateWrapper<>(); UpdateWrapper<ShopStoreInfo> shopStoreInfoUpdateWrapper = new UpdateWrapper<>();
shopStoreInfoUpdateWrapper.eq("store_id",storeId); shopStoreInfoUpdateWrapper.eq("store_id", storeId);
shopStoreInfoUpdateWrapper.set("store_opening_hours",store_opening_hours); shopStoreInfoUpdateWrapper.set("store_opening_hours", store_opening_hours);
shopStoreInfoUpdateWrapper.set("store_close_hours",store_close_hours); shopStoreInfoUpdateWrapper.set("store_close_hours", store_close_hours);
shopStoreInfoService.update(shopStoreInfoUpdateWrapper); shopStoreInfoService.update(shopStoreInfoUpdateWrapper);
} }
// 使用 UpdateWrapper 更新店铺营业状态 // 使用 UpdateWrapper 更新店铺营业状态

7
mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreInfoServiceImpl.java
View File

@ -53,6 +53,13 @@ public class ShopStoreInfoServiceImpl extends BaseServiceImpl<ShopStoreInfoMappe
return shopStoreInfoMapper.getStoreInfoById(store_id); return shopStoreInfoMapper.getStoreInfoById(store_id);
} }
@Override
public ShopStoreInfo getShopStoreInfoByStoreId(Integer storeId) {
QueryWrapper<ShopStoreInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("store_id", storeId);
return findOne(queryWrapper);
}
@Override @Override
public Map getInfoList(QueryWrapper<ShopStoreInfo> queryWrapper, Integer pageNum, Integer pageSize) { public Map getInfoList(QueryWrapper<ShopStoreInfo> queryWrapper, Integer pageNum, Integer pageSize) {
Page<ShopStoreInfo> lists = lists(queryWrapper, pageNum, pageSize); Page<ShopStoreInfo> lists = lists(queryWrapper, pageNum, pageSize);