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 85e532a1..facfcd22 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 @@ -123,9 +123,12 @@ public class EsignPlatformInfo implements Serializable { @ApiModelProperty(value = "分账比例值,取值范围:[0.01,1.00]") private BigDecimal split_ratio; - @ApiModelProperty(value = "记录状态:1-有效;2-无效;") + @ApiModelProperty(value = "状态:1-已审核通过;2-审核未通过;3-待审中;") private Integer status; + @ApiModelProperty(value = "审核代理商备注") + private String remark; + @ApiModelProperty(value = "创建人用户ID") private String created_by; diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopMchEntry.java b/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopMchEntry.java index 30a8edd3..6ab2c60a 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopMchEntry.java +++ b/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopMchEntry.java @@ -9,6 +9,7 @@ package com.suisung.mall.common.modules.store; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -267,6 +268,10 @@ public class ShopMchEntry implements Serializable { @ApiModelProperty(value = "父入驻id(总店入驻id)") private Long parent_id; + @TableField(exist = false) + @ApiModelProperty(value = "代理商邀请码") + private String invite_code; + @ApiModelProperty(value = "该商家入驻记录是否有效,0:无效,1:有效") private Integer status; diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/EsignPlatformInfoService.java b/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/EsignPlatformInfoService.java index 1dc764cc..fba803ca 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/EsignPlatformInfoService.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/EsignPlatformInfoService.java @@ -95,6 +95,14 @@ public interface EsignPlatformInfoService { */ EsignPlatformInfo getMch2ndAgentWithShippingFee(Long mchId); + /** + * 根据代理邀请码获取代理商 信息 + * + * @param inviteCode + * @return + */ + EsignPlatformInfo getByInviteCode(String inviteCode); + /** * 根据代理商ID获取供应商 商家ID * 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 71d26b3e..165b96c8 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 @@ -418,6 +418,41 @@ public class EsignPlatformInfoServiceImpl extends BaseServiceImpl() + .eq(EsignPlatformInfo::getInvite_code, inviteCode) + .eq(EsignPlatformInfo::getStatus, CommonConstant.Enable) + .orderByAsc(EsignPlatformInfo::getId), + false + ); + + if (result != null) { + log.debug("[根据邀请码获取代理商] 成功获取代理商信息,ID: {}, 公司名: {}", + result.getId(), result.getLicense_company()); + } else { + log.warn("[根据邀请码获取代理商] 未找到有效的代理商信息,邀请码: {}", inviteCode); + } + + return result; + } catch (Exception e) { + log.error("[根据邀请码获取代理商] 查询过程中发生异常,邀请码: {}", inviteCode, e); + return null; + } + } + + /** * 根据代理商ID获取供应商商家ID * @@ -517,6 +552,7 @@ public class EsignPlatformInfoServiceImpl extends BaseServiceImpl 0) { - if (!has2ndAgent && CheckUtil.isNotEmpty(shoppingFeeInner)) { - // 没有县级代理商的时候,配送费暂由平台代收 add 2025-10-11 - V3SacsSeparateRecvDatas receiver = new V3SacsSeparateRecvDatas(); - receiver.setRecvNo(platformReceiver.getReceiver_no()); - receiver.setSeparateValue(Convert.toStr(platformAmount + shoppingFeeInner)); - recvDatas.add(receiver); - } else { - V3SacsSeparateRecvDatas receiver = new V3SacsSeparateRecvDatas(); - receiver.setRecvNo(platformReceiver.getReceiver_no()); - receiver.setSeparateValue(Convert.toStr(platformAmount)); - recvDatas.add(receiver); - } +// if (!has2ndAgent && CheckUtil.isNotEmpty(shoppingFeeInner)) { +// // 没有县级代理商的时候,配送费暂由平台代收 add 2025-10-11 +// V3SacsSeparateRecvDatas receiver = new V3SacsSeparateRecvDatas(); +// receiver.setRecvNo(platformReceiver.getReceiver_no()); +// receiver.setSeparateValue(Convert.toStr(platformAmount + shoppingFeeInner)); +// recvDatas.add(receiver); +// } else { +// V3SacsSeparateRecvDatas receiver = new V3SacsSeparateRecvDatas(); +// receiver.setRecvNo(platformReceiver.getReceiver_no()); +// receiver.setSeparateValue(Convert.toStr(platformAmount)); +// recvDatas.add(receiver); +// } + + // 不管有没有县级代理商,内部配送费都交给平台收取 2026-01-26 update + V3SacsSeparateRecvDatas receiver = new V3SacsSeparateRecvDatas(); + receiver.setRecvNo(platformReceiver.getReceiver_no()); + receiver.setSeparateValue(Convert.toStr(platformAmount + shoppingFeeInner)); + recvDatas.add(receiver); } - // 县级代理商分账参数 + // 有县级代理商分账情况 if (has2ndAgent) { - if (CheckUtil.isNotEmpty(shoppingFeeInner)) { - // 有县级代理商的时候,配送费暂由它代收 add 2025-10-11 - V3SacsSeparateRecvDatas shippingFeeReceiver = new V3SacsSeparateRecvDatas(); - shippingFeeReceiver.setRecvNo(agent2ndReceiver.getReceiver_no()); - shippingFeeReceiver.setSeparateValue(Convert.toStr(agent2ndAmount + shoppingFeeInner)); - recvDatas.add(shippingFeeReceiver); - } else { - V3SacsSeparateRecvDatas receiver = new V3SacsSeparateRecvDatas(); - receiver.setRecvNo(agent2ndReceiver.getReceiver_no()); - receiver.setSeparateValue(Convert.toStr(agent2ndAmount)); - recvDatas.add(receiver); - } +// if (CheckUtil.isNotEmpty(shoppingFeeInner)) { +// // 有县级代理商的时候,配送费暂由它代收 add 2025-10-11 +// V3SacsSeparateRecvDatas shippingFeeReceiver = new V3SacsSeparateRecvDatas(); +// shippingFeeReceiver.setRecvNo(agent2ndReceiver.getReceiver_no()); +// shippingFeeReceiver.setSeparateValue(Convert.toStr(agent2ndAmount + shoppingFeeInner)); +// recvDatas.add(shippingFeeReceiver); +// } else { +// V3SacsSeparateRecvDatas receiver = new V3SacsSeparateRecvDatas(); +// receiver.setRecvNo(agent2ndReceiver.getReceiver_no()); +// receiver.setSeparateValue(Convert.toStr(agent2ndAmount)); +// recvDatas.add(receiver); +// } + + // 不管有没有县级代理商,内部配送费都交给平台收取 2026-01-26 update + V3SacsSeparateRecvDatas receiver = new V3SacsSeparateRecvDatas(); + receiver.setRecvNo(agent2ndReceiver.getReceiver_no()); + receiver.setSeparateValue(Convert.toStr(agent2ndAmount)); + recvDatas.add(receiver); } // 省级代理商分账参数 diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java index 1d63ec6f..b57d6f55 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java @@ -27,6 +27,7 @@ import com.suisung.mall.common.constant.CommonConstant; import com.suisung.mall.common.domain.UserDto; import com.suisung.mall.common.feignService.AccountService; import com.suisung.mall.common.modules.account.AccountUserBase; +import com.suisung.mall.common.modules.esign.EsignPlatformInfo; import com.suisung.mall.common.modules.lakala.LklLedgerEc; import com.suisung.mall.common.modules.store.ShopMchEntry; import com.suisung.mall.common.modules.store.ShopStoreEmployee; @@ -72,6 +73,7 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl