From cf2605ae641de1c88bf1efccfa89a8d3f337570b Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Tue, 24 Jun 2025 23:02:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E8=B4=A6=E5=A4=B1=E8=B4=A5=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E5=86=99=E5=85=A5=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/lakala/LklOrderSeparate.java | 3 +++ .../service/LklOrderSeparateService.java | 9 ++++++++ .../service/impl/LakalaApiServiceImpl.java | 6 +++++- .../impl/LklOrderSeparateServiceImpl.java | 18 ++++++++++++++++ .../lakala/service/impl/LklTkServiceImpl.java | 21 +++++++++++-------- 5 files changed, 47 insertions(+), 10 deletions(-) diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/lakala/LklOrderSeparate.java b/mall-common/src/main/java/com/suisung/mall/common/modules/lakala/LklOrderSeparate.java index 568e852c..cff6c638 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/modules/lakala/LklOrderSeparate.java +++ b/mall-common/src/main/java/com/suisung/mall/common/modules/lakala/LklOrderSeparate.java @@ -88,6 +88,9 @@ public class LklOrderSeparate { @ApiModelProperty(value = "处理状态：ACCEPTED-已受理, PROCESSING-处理中, FAIL-失败, SUCCESS-成功") private String final_status; + @ApiModelProperty(value = "分账（失败后）的标记") + private String remark; + @ApiModelProperty(value = "新建时间") private Date created_at; diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/LklOrderSeparateService.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/LklOrderSeparateService.java index 910102a0..c07df1d6 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/LklOrderSeparateService.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/LklOrderSeparateService.java @@ -29,4 +29,13 @@ public interface LklOrderSeparateService extends IBaseService * @return */ LklOrderSeparate getByOutTradeNo(String logNo, String outSeparateNo); + + /** + * 修改备注 + * + * @param id + * @param remark + * @return + */ + Boolean updateRemark(Long id, String remark); } 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 c7231408..bf9e267f 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 @@ -1601,6 +1601,7 @@ public class LakalaApiServiceImpl implements LakalaApiService { String errorMsg = String.format("店铺[%s]订单金额异常或运费过高，跳过分账", shopOrderLkl.getStore_id()); log.error(errorMsg); errorMessages.append(errorMsg).append("; "); + lklOrderSeparateService.updateRemark(lklOrderSeparateExist.getId(), errorMsg); continue; } @@ -1612,13 +1613,16 @@ public class LakalaApiServiceImpl implements LakalaApiService { String errorMsg = String.format("店铺[%s]未绑定平台方接收账户，跳过分账", shopOrderLkl.getStore_id()); log.error(errorMsg); errorMessages.append(errorMsg).append("; "); + lklOrderSeparateService.updateRemark(lklOrderSeparateExist.getId(), errorMsg); continue; } // 判断是否可以分账（商家比例非100%） boolean canSplit = splitRatioMch != null && splitRatioMch.compareTo(new BigDecimal("100")) < 0; if (!canSplit) { - log.warn("店铺[{}]分账比例为0，仅扣除运费", shopOrderLkl.getStore_id()); + String errorMsg = String.format("店铺[%s]分账比例为0，仅扣除运费", shopOrderLkl.getStore_id()); + log.error(errorMsg); + lklOrderSeparateService.updateRemark(lklOrderSeparateExist.getId(), errorMsg); } // 构建分账请求对象 diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklOrderSeparateServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklOrderSeparateServiceImpl.java index d86b7ce8..6369640d 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklOrderSeparateServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklOrderSeparateServiceImpl.java @@ -81,4 +81,22 @@ public class LklOrderSeparateServiceImpl extends BaseServiceImpl retPair = shopStoreBaseService.merchEntryInfo2StoreInfo(mchMobile, true); - if (retPair.getFirst() > 0) { - boolean updateSuccess = shopMchEntryService.updateMulStatus(mchMobile, "", 0, 0, 1, 0, 0, 0, CommonConstant.MCH_APPR_STA_LKL_PADDING); - if (!updateSuccess) { - logger.warn("更新店铺状态失败: mchMobile={}", mchMobile); - } else { - logger.info("商家进件：初始化店铺成功！mchMobile={}", mchMobile); - } - } else { - logger.warn("初始化店铺失败: mchMobile={}, reason={}", mchMobile, retPair.getSecond()); + if (retPair.getFirst() <= 0) { + logger.error("初始化店铺失败: mchMobile={}, reason={}", mchMobile, retPair.getSecond()); } + logger.info("商家进件：初始化店铺成功！mchMobile={}", mchMobile); + +// boolean updateSuccess = shopMchEntryService.updateMulStatus(mchMobile, "", 0, 0, 1, 0, 0, 0, CommonConstant.MCH_APPR_STA_LKL_PADDING); +// if (!updateSuccess) { +// logger.warn("更新店铺状态失败: mchMobile={}", mchMobile); +// } else { +// logger.info("商家进件：初始化店铺成功！mchMobile={}", mchMobile); +// } + } catch (Exception e) { // 捕获所有异常，防止事务中断 logger.error("初始化店铺时发生异常", e);