From 6b56672a7e02a0bf340021f00a4898bee9b13834 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期二, 03 二月 2026 14:00:53 +0800
Subject: [PATCH] feat(applet):下单经销商支付参数根据用户预绑定推荐人获取
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ICBCNotifyServiceImpl.java | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 155 insertions(+), 19 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ICBCNotifyServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ICBCNotifyServiceImpl.java
index b91f77f..fa4e76a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ICBCNotifyServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ICBCNotifyServiceImpl.java
@@ -9,9 +9,14 @@
import com.icbc.api.utils.IcbcSignature;
import com.icbc.api.utils.WebUtils;
import com.ruoyi.system.config.ICBCConfig;
+import com.ruoyi.system.enums.BigGiftPackageOrderStatusEnum;
+import com.ruoyi.system.enums.PhysicalGoodsOrderStatusEnum;
+import com.ruoyi.system.model.TAppUser;
+import com.ruoyi.system.model.TBigGiftPackage;
import com.ruoyi.system.model.TBigGiftPackageOrder;
import com.ruoyi.system.model.TPhysicalGoodsOrder;
import com.ruoyi.system.service.*;
+import com.ruoyi.common.core.domain.entity.SysUser;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
@@ -39,11 +44,17 @@
private final ICBCConfig icbcConfig;
+ private final TBigGiftPackageService bigGiftPackageService;
+
private final TBigGiftPackageOrderService bigGiftPackageOrderService;
private final TPhysicalGoodsOrderService physicalGoodsOrderService;
private final TCommissionTransactionFlowService commissionTransactionFlowService;
+
+ private final TAppUserService appUserService;
+
+ private final ISysUserService sysUserService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -62,7 +73,7 @@
String payOrderCode = bizContent.getString("out_trade_no");
String returnCode = bizContent.getString("return_code");
msgId = bizContent.getString("msg_id");
-
+ String orderId = bizContent.getString("order_id");
// 验签
if (validateSignature(request, icbcConfig.getNotifyUrlMethod() + "/big-gift/pay-notify")) {
signResult = true;
@@ -83,12 +94,12 @@
// 处理每个订单
for (TBigGiftPackageOrder order : orders) {
- processBigGiftPayment(order);
+ processBigGiftPayment(order, orderId);
}
} else {
log.error("支付订单号{}【工商银行】大礼包支付失败，错误信息：{}", payOrderCode, bizContent.getString("return_msg"));
//更新订单状态为已取消
- orders.forEach(item->item.setStatus(6));
+ orders.forEach(item->item.setStatus(BigGiftPackageOrderStatusEnum.CANCELED.getCode()));
bigGiftPackageOrderService.updateBatchById(orders);
}
} else {
@@ -119,7 +130,7 @@
String finalPayOrderCode = bizContent.getString("out_trade_no");
String returnCode = bizContent.getString("return_code");
msgId = bizContent.getString("msg_id");
-
+ String orderId = bizContent.getString("order_id");
// 验签
if (validateSignature(request, icbcConfig.getNotifyUrlMethod() + "/big-gift/final-pay-notify")) {
signResult = true;
@@ -142,20 +153,32 @@
}
// 更新订单状态为"完成支付"
- order.setStatus(3);
+ order.setStatus(BigGiftPackageOrderStatusEnum.PAID.getCode());
order.setFinalPaymentTime(LocalDateTime.now());
- order.setFinalPaymentSerialNumber(finalPayOrderCode);
+ order.setFinalPaymentThirdSerialNumber(orderId);
+ order.setPaymentPrice(order.getPaymentPrice().add(order.getFinalPayment()));
bigGiftPackageOrderService.updateById(order);
log.info("订单{}状态更新为完成支付", order.getCode());
- // 尾款支付完成后，必须计算分佣
+ // 查询最新大礼包商品配置，获取积分结算价用于佣金计算
+ TBigGiftPackage bigGiftPackage = bigGiftPackageService.getById(order.getBigGiftPackageId());
+ if (bigGiftPackage == null || bigGiftPackage.getPointsSettlementPrice() == null) {
+ log.error("订单{}对应的大礼包商品配置不存在或积分结算价为空，无法计算佣金", order.getCode());
+ sendResponse(response, signResult, msgId);
+ return;
+ }
+
+ // 尾款支付完成后，使用大礼包商品配置的积分结算价计算分佣
commissionTransactionFlowService.calculateAndSaveCommission(
order.getId(),
1, // 订单类型：1=大礼包
- order.getOrderPrice(),
+ bigGiftPackage.getPointsSettlementPrice(),
order.getAppUserId()
);
- log.info("订单{}分佣计算完成", order.getCode());
+ log.info("订单{}分佣计算完成，使用积分结算价：{}", order.getCode(), bigGiftPackage.getPointsSettlementPrice());
+
+ // 处理用户推荐状态和公司关联
+ processUserReferrerAndCompany(order.getAppUserId());
} else {
log.error("尾款支付订单号{}【工商银行】大礼包尾款支付失败，错误信息：{}", finalPayOrderCode, bizContent.getString("return_msg"));
}
@@ -207,15 +230,18 @@
}
// 更新订单状态为"完成支付"
- order.setStatus(2);
+ order.setStatus(PhysicalGoodsOrderStatusEnum.PAID.getCode());
order.setPaymentTime(LocalDateTime.now());
order.setPaymentSerialNumber(orderId);
physicalGoodsOrderService.updateById(order);
log.info("订单{}状态更新为完成支付", orderCode);
+ // 处理用户推荐状态和公司关联
+ processUserReferrerAndCompany(order.getAppUserId());
+
} else {
log.error("订单{}【工商银行】实物商品支付失败，错误信息：{}", orderCode, bizContent.getString("return_msg"));
- order.setStatus(5);
+ order.setStatus(PhysicalGoodsOrderStatusEnum.CANCELED.getCode());
physicalGoodsOrderService.updateById(order);
}
} else {
@@ -232,39 +258,48 @@
/**
* 处理大礼包支付（定金或全款）
*/
- private void processBigGiftPayment(TBigGiftPackageOrder order) {
+ private void processBigGiftPayment(TBigGiftPackageOrder order, String orderId) {
Integer paymentType = order.getPaymentType();
if (paymentType == 1) {
// 订金+尾款模式，更新状态为"已付订金"
- order.setStatus(2);
+ order.setStatus(BigGiftPackageOrderStatusEnum.DEPOSIT_PAID.getCode());
order.setDepositTime(LocalDateTime.now());
- order.setDepositPaymentSerialNumber(order.getPayOrderCode());
+ order.setDepositPaymentThirdSerialNumber(orderId);
bigGiftPackageOrderService.updateById(order);
log.info("订单{}状态更新为已付订金，不计算分佣", order.getCode());
} else if (paymentType == 2) {
// 全款模式，更新状态为"完成支付"
- order.setStatus(3);
+ order.setStatus(BigGiftPackageOrderStatusEnum.PAID.getCode());
order.setDepositTime(LocalDateTime.now());
- order.setDepositPaymentSerialNumber(order.getPayOrderCode());
+ order.setDepositPaymentThirdSerialNumber(orderId);
bigGiftPackageOrderService.updateById(order);
log.info("订单{}状态更新为完成支付", order.getCode());
// 判断是否启用生效日
Boolean effectDayFlag = order.getEffectDayFlag();
if (effectDayFlag == null || !effectDayFlag) {
- // 未启用生效日，立即计算分佣
+ // 查询最新大礼包商品配置，获取积分结算价用于佣金计算
+ TBigGiftPackage bigGiftPackage = bigGiftPackageService.getById(order.getBigGiftPackageId());
+ if (bigGiftPackage == null || bigGiftPackage.getPointsSettlementPrice() == null) {
+ log.error("订单{}对应的大礼包商品配置不存在或积分结算价为空，无法计算佣金", order.getCode());
+ return;
+ }
+ // 未启用生效日，使用大礼包商品配置的积分结算价立即计算分佣
commissionTransactionFlowService.calculateAndSaveCommission(
order.getId(),
1, // 订单类型：1=大礼包
- order.getOrderPrice(),
+ bigGiftPackage.getPointsSettlementPrice(),
order.getAppUserId()
);
- log.info("订单{}未启用生效日，立即计算分佣", order.getCode());
+ log.info("订单{}未启用生效日，立即计算分佣，使用积分结算价：{}", order.getCode(), bigGiftPackage.getPointsSettlementPrice());
} else {
// 启用生效日，不计算分佣（由定时任务处理）
log.info("订单{}启用生效日，延迟计算分佣", order.getCode());
}
+
+ // 处理用户推荐状态和公司关联
+ processUserReferrerAndCompany(order.getAppUserId());
}
}
@@ -352,4 +387,105 @@
}
}
+ /**
+ * 处理用户推荐状态和公司关联
+ * 支付成功后调用此方法更新用户信息
+ *
+ * @param appUserId 下单用户ID
+ */
+ private void processUserReferrerAndCompany(Integer appUserId) {
+ log.info("开始处理用户{}推荐状态和公司关联", appUserId);
+ if (appUserId == null) {
+ return;
+ }
+
+ TAppUser appUser = appUserService.getById(appUserId);
+ if (appUser == null) {
+ log.warn("用户{}不存在，跳过推荐状态和公司关联处理", appUserId);
+ return;
+ }
+
+ boolean needUpdate = false;
+
+ // 1. 更新推荐状态：如果 referrerUserId 不为空且 referrerStatus=1，则更新为 referrerStatus=2
+ if (appUser.getReferrerUserId() != null && Integer.valueOf(1).equals(appUser.getReferrerStatus())) {
+ appUser.setReferrerStatus(2);
+ needUpdate = true;
+ log.info("用户{}推荐状态从临时(1)更新为正式(2)", appUserId);
+ }
+
+ // 2. 关联公司：如果用户 companyId 为空
+ if (appUser.getCompanyId() == null) {
+ Integer companyId = null;
+
+ // 判断是否同时存在两种推荐来源且推荐状态为临时
+ boolean hasBothReferrer = appUser.getReferrerUserId() != null
+ && Integer.valueOf(1).equals(appUser.getReferrerStatus())
+ && appUser.getReferrerSysUserId() != null;
+
+ if (hasBothReferrer) {
+ // 两种推荐来源都存在，比较推荐时间，取后推荐的用户的 companyId
+ LocalDateTime referrerTime = appUser.getReferrerTime();
+ LocalDateTime referrerSysUserTime = appUser.getReferrerSysUserTime();
+
+ // 判断哪个推荐时间更晚
+ boolean useSysUserCompany = false;
+ if (referrerSysUserTime != null && referrerTime != null) {
+ useSysUserCompany = referrerSysUserTime.isAfter(referrerTime);
+ } else if (referrerSysUserTime != null) {
+ useSysUserCompany = true;
+ }
+ // 如果 referrerTime != null 且 referrerSysUserTime == null，则 useSysUserCompany 保持 false
+
+ if (useSysUserCompany) {
+ // 使用股东（SysUser）的 companyId
+ SysUser sysUser = sysUserService.selectUserById(Long.valueOf(appUser.getReferrerSysUserId()));
+ if (sysUser != null && sysUser.getCompanyId() != null) {
+ companyId = sysUser.getCompanyId();
+ log.info("用户{}两种推荐来源都存在，股东推荐时间({})晚于普通推荐时间({})，通过股东(SysUser:{})关联公司{}",
+ appUserId, referrerSysUserTime, referrerTime, appUser.getReferrerSysUserId(), companyId);
+ }
+ } else {
+ // 使用推荐人（TAppUser）的 companyId
+ TAppUser referrerAppUser = appUserService.getById(appUser.getReferrerUserId());
+ if (referrerAppUser != null && referrerAppUser.getCompanyId() != null) {
+ companyId = referrerAppUser.getCompanyId();
+ log.info("用户{}两种推荐来源都存在，普通推荐时间({})晚于或等于股东推荐时间({})，通过推荐人(TAppUser:{})关联公司{}",
+ appUserId, referrerTime, referrerSysUserTime, appUser.getReferrerUserId(), companyId);
+ }
+ }
+ } else {
+ // 只有一种推荐来源，按原逻辑处理
+ // 优先使用 referrerSysUserId 对应的 SysUser 的 companyId
+ if (appUser.getReferrerSysUserId() != null) {
+ SysUser sysUser = sysUserService.selectUserById(Long.valueOf(appUser.getReferrerSysUserId()));
+ if (sysUser != null && sysUser.getCompanyId() != null) {
+ companyId = sysUser.getCompanyId();
+ log.info("用户{}通过股东(SysUser:{})关联公司{}", appUserId, appUser.getReferrerSysUserId(), companyId);
+ }
+ }
+
+ // 如果 referrerSysUserId 为空或对应的 SysUser 没有 companyId，则使用 referrerUserId 对应的 TAppUser 的 companyId
+ if (companyId == null && appUser.getReferrerUserId() != null) {
+ TAppUser referrerAppUser = appUserService.getById(appUser.getReferrerUserId());
+ if (referrerAppUser != null && referrerAppUser.getCompanyId() != null) {
+ companyId = referrerAppUser.getCompanyId();
+ log.info("用户{}通过推荐人(TAppUser:{})关联公司{}", appUserId, appUser.getReferrerUserId(), companyId);
+ }
+ }
+ }
+
+ if (companyId != null) {
+ appUser.setCompanyId(companyId);
+ needUpdate = true;
+ }
+ }
+
+ // 3. 更新用户信息
+ if (needUpdate) {
+ appUserService.updateById(appUser);
+ log.info("用户{}信息更新完成，referrerStatus={}，companyId={}", appUserId, appUser.getReferrerStatus(), appUser.getCompanyId());
+ }
+ }
+
}
--
Gitblit v1.7.1