From 0bd5297ea7540bcba510f1c4cb87da047db0688c Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Wed, 15 Oct 2025 10:16:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E9=A9=BB=E4=BB=A3=E7=90=86=E5=95=86?= =?UTF-8?q?=E7=9A=84=E5=A2=9E=E5=BC=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/esign/EsignPlatformInfo.java | 4 +- .../lakala/LklLedgerMerReceiverBind.java | 2 +- .../modules/lakala/LklLedgerReceiver.java | 2 +- .../impl/EsignPlatformInfoServiceImpl.java | 62 +++++++++++-------- .../impl/LklLedgerReceiverServiceImpl.java | 43 ++++++++----- 5 files changed, 69 insertions(+), 44 deletions(-) diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/esign/EsignPlatformInfo.java b/mall-common/src/main/java/com/suisung/mall/common/modules/esign/EsignPlatformInfo.java index 65fe2e04..85e532a1 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/modules/esign/EsignPlatformInfo.java +++ b/mall-common/src/main/java/com/suisung/mall/common/modules/esign/EsignPlatformInfo.java @@ -29,7 +29,7 @@ import java.util.Date; public class EsignPlatformInfo implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "id", type = IdType.INPUT) + @TableId(value = "id", type = IdType.AUTO) @ApiModelProperty(value = "自增ID") private Long id; @@ -108,7 +108,7 @@ public class EsignPlatformInfo implements Serializable { @ApiModelProperty(value = "平台方公司维度") private String latitude; - @ApiModelProperty(value = "代理商等级:0-平台方(只能一条记录)；1-一级代理；2-二级代理；3-三级代理；4-四级代理；") + @ApiModelProperty(value = "代理商等级:0-平台方(只能一条记录)；1-一级代理；2-二级代理；") private Integer level; @ApiModelProperty(value = "邀请码，后期跟收益有关") diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/lakala/LklLedgerMerReceiverBind.java b/mall-common/src/main/java/com/suisung/mall/common/modules/lakala/LklLedgerMerReceiverBind.java index 12a86ea8..19d80664 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/modules/lakala/LklLedgerMerReceiverBind.java +++ b/mall-common/src/main/java/com/suisung/mall/common/modules/lakala/LklLedgerMerReceiverBind.java @@ -29,7 +29,7 @@ import java.util.Date; public class LklLedgerMerReceiverBind implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "id", type = IdType.INPUT) + @TableId(value = "id", type = IdType.AUTO) @ApiModelProperty(value = "自增ID") private Long id; private String order_no; diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/lakala/LklLedgerReceiver.java b/mall-common/src/main/java/com/suisung/mall/common/modules/lakala/LklLedgerReceiver.java index abeb6f4f..ad0bce8b 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/modules/lakala/LklLedgerReceiver.java +++ b/mall-common/src/main/java/com/suisung/mall/common/modules/lakala/LklLedgerReceiver.java @@ -29,7 +29,7 @@ import java.util.Date; public class LklLedgerReceiver implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "id", type = IdType.INPUT) + @TableId(value = "id", type = IdType.AUTO) @ApiModelProperty(value = "自增ID") private Long id; private String order_no; diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignPlatformInfoServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignPlatformInfoServiceImpl.java index 9776561f..12de4b3f 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignPlatformInfoServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignPlatformInfoServiceImpl.java @@ -27,6 +27,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; @Slf4j @@ -71,28 +73,38 @@ public class EsignPlatformInfoServiceImpl extends BaseServiceImpl selectAgentAndPlatformByMchId(Long mchId) { + List esignPlatformInfos = new ArrayList<>(); + + log.debug("[获取平台和代理商信息] 开始查询平台方和代理商信息，商户ID: {}", mchId); + // 获取平台方记录 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("level", 0) .eq("status", CommonConstant.Enable) - .orderByAsc("level"); + .orderByAsc("id"); - List esignPlatformInfos = list(queryWrapper); - if (CollectionUtil.isEmpty(esignPlatformInfos)) { - log.error("[获取平台和代理商信息] 未找到平台方记录"); - return null; + EsignPlatformInfo esignPlatformInfo = findOne(queryWrapper); + if (esignPlatformInfo == null || esignPlatformInfo.getId() == null || esignPlatformInfo.getId() <= 0) { + log.error("[获取平台和代理商信息] 未找到有效的平台方记录"); + return Collections.emptyList(); } + esignPlatformInfos.add(esignPlatformInfo); + log.debug("[获取平台和代理商信息] 成功获取平台方信息，ID: {}", esignPlatformInfo.getId()); + // 获取商户的二级代理 EsignPlatformInfo agent2nd = getMch2ndAgent(mchId); if (agent2nd == null) { + log.debug("[获取平台和代理商信息] 未找到二级代理，仅返回平台方信息"); return esignPlatformInfos; } esignPlatformInfos.add(agent2nd); + log.debug("[获取平台和代理商信息] 成功获取二级代理信息，ID: {}", agent2nd.getId()); // 获取一级代理（如果存在） - if (CheckUtil.isEmpty(agent2nd.getParent_id())) { + if (agent2nd.getParent_id() == null || agent2nd.getParent_id() <= 0) { + log.debug("[获取平台和代理商信息] 二级代理无有效父级ID，返回平台方和二级代理信息"); return esignPlatformInfos; } @@ -100,11 +112,15 @@ public class EsignPlatformInfoServiceImpl extends BaseServiceImpl 0) { queryWrapper.eq("id", shopMchEntry.getDistributor_id()); log.debug("[获取二级代理] 使用指定分销商ID查询，distributorId={}", shopMchEntry.getDistributor_id()); + } else if (StrUtil.isNotBlank(shopMchEntry.getStore_district())) { + // 运费代理商 + queryWrapper.eq("license_district_id", shopMchEntry.getStore_district()) + .gt("shipping_fee", 0).ne("supplier_id", "") + .orderByAsc("id"); + log.debug("[获取二级代理] 使用区域信息查询，districtId={}", shopMchEntry.getStore_district()); + } else { + return null; } EsignPlatformInfo result = findOne(queryWrapper); - if (result == null) { - if (StrUtil.isNotBlank(shopMchEntry.getStore_district())) { - // 运费代理商 - queryWrapper.clear(); - queryWrapper.eq("level", CommonConstant.Agent_Level_2nd) - .eq("status", CommonConstant.Enable) - .eq("license_district_id", shopMchEntry.getStore_district()) - .gt("shipping_fee", 0).ne("supplier_id", "") - .orderByAsc("id"); - log.debug("[获取二级代理] 使用区域信息查询，districtId={}", shopMchEntry.getStore_district()); - - result = findOne(queryWrapper); - } - } - if (result == null) { log.info("[获取二级代理] 未找到匹配的二级代理信息，mchId={}", mchId); } else { diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklLedgerReceiverServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklLedgerReceiverServiceImpl.java index 5f413f2f..425815d3 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklLedgerReceiverServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklLedgerReceiverServiceImpl.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -374,17 +375,24 @@ public class LklLedgerReceiverServiceImpl extends BaseServiceImpl selectAgentAndPlatformByMchId(Long mchId) { + List list = new ArrayList<>(); + + log.debug("[获取平台和代理商信息] 开始查询平台方和代理商接收方信息，商户ID: {}", mchId); + // 获取平台方记录 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("level", 0) .eq("status", CommonConstant.Enable).orderByAsc("id"); - List list = list(queryWrapper); - if (CollectionUtil.isEmpty(list)) { - log.error("[获取平台和代理商信息] 未找到平台方记录, mchId={}", mchId); + LklLedgerReceiver platformInfo = findOne(queryWrapper); + if (platformInfo == null || platformInfo.getId() == null || platformInfo.getId() <= 0) { + log.error("[获取平台和代理商信息] 未找到有效的平台方记录, mchId={}", mchId); return Collections.emptyList(); } + list.add(platformInfo); + log.debug("[获取平台和代理商信息] 成功获取平台方信息，ID: {}", platformInfo.getId()); + // 获取商户的二级代理 LklLedgerReceiver agent2nd = getMch2ndAgent(mchId); if (agent2nd == null) { @@ -393,10 +401,11 @@ public class LklLedgerReceiverServiceImpl extends BaseServiceImpl 0) { queryWrapper.eq("platform_id", shopMchEntry.getDistributor_id()); log.debug("[获取二级代理] 使用指定分销商ID查询，distributorId={}", shopMchEntry.getDistributor_id()); } else if (StrUtil.isNotBlank(shopMchEntry.getStore_district())) { // 运费代理商 - queryWrapper.clear(); - queryWrapper.eq("level", CommonConstant.Agent_Level_2nd) - .eq("status", CommonConstant.Enable) - .eq("license_district_id", shopMchEntry.getStore_district()) + queryWrapper.eq("license_district_id", shopMchEntry.getStore_district()) .gt("shipping_fee", 0).ne("supplier_id", "") .orderByAsc("id"); log.debug("[获取二级代理] 使用区域信息查询，districtId={}", shopMchEntry.getStore_district()); + } else { + log.warn("[获取二级代理] 未指定分销商ID或区域信息，mchId={}", mchId); + return null; } LklLedgerReceiver result = findOne(queryWrapper); - if (result == null) { log.info("[获取二级代理] 未找到匹配的二级代理信息，mchId={}", mchId); } else { @@ -478,7 +491,7 @@ public class LklLedgerReceiverServiceImpl extends BaseServiceImpl