feat(applet):下单经销商支付参数根据用户预绑定推荐人获取

“mitao”

2026-02-03 6b56672a7e02a0bf340021f00a4898bee9b13834

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ICBCNotifyServiceImpl.java

@@ -12,6 +12,7 @@
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.*;
@@ -42,6 +43,8 @@
public class ICBCNotifyServiceImpl implements ICBCNotifyService {

    private final ICBCConfig icbcConfig;

    private final TBigGiftPackageService bigGiftPackageService;

    private final TBigGiftPackageOrderService bigGiftPackageOrderService;

@@ -157,14 +160,22 @@
                    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());
@@ -268,14 +279,20 @@
            // 判断是否启用生效日
            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());
@@ -377,6 +394,7 @@
     * @param appUserId 下单用户ID
     */
    private void processUserReferrerAndCompany(Integer appUserId) {
        log.info("开始处理用户{}推荐状态和公司关联", appUserId);
        if (appUserId == null) {
            return;
        }
@@ -400,21 +418,60 @@
        if (appUser.getCompanyId() == null) {
            Integer companyId = null;

            // 优先使用 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);
                }
            }
            // 判断是否同时存在两种推荐来源且推荐状态为临时
            boolean hasBothReferrer = appUser.getReferrerUserId() != null
                    && Integer.valueOf(1).equals(appUser.getReferrerStatus())
                    && appUser.getReferrerSysUserId() != null;

            // 如果 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 (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);
                    }
                }
            }