Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
张松 2025-10-27 14:17:57 +08:00
commit 89dfeb8a20
1 changed files with 3 additions and 6 deletions

View File

@ -53,13 +53,10 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
private MkDistributionConfigService mkDistributionConfigService; private MkDistributionConfigService mkDistributionConfigService;
@Resource @Resource
private MkDistributionLevelConfigService levelConfigService; private MkDistributionLevelConfigService levelConfigService;
@DubboReference
private ShopUserService shopUserService;
@Resource @Resource
private MkDistributionAmountFlowService distributionAmountFlowService; private MkDistributionAmountFlowService distributionAmountFlowService;
@Resource @DubboReference
private MkDistributionUserService distributionUserService; private ShopUserService shopUserService;
@DubboReference @DubboReference
private OrderPaymentService orderPaymentService; private OrderPaymentService orderPaymentService;
@DubboReference @DubboReference
@ -177,7 +174,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
.setType(TableValueConstant.DistributionAmountFlow.Type.OPEN.getCode()) .setType(TableValueConstant.DistributionAmountFlow.Type.OPEN.getCode())
.setMainShopId(mainShopId).setShopId(shopId).setAmount(finalAmount).setChangeAmount(amount).setSourceId(sourceId) .setMainShopId(mainShopId).setShopId(shopId).setAmount(finalAmount).setChangeAmount(amount).setSourceId(sourceId)
.setRemark("分销员购买").setOpAccount(StpKit.USER.getAccount())); .setRemark("分销员购买").setOpAccount(StpKit.USER.getAccount()));
distributionUserService.addDistributionUser(new MkDistributionUser().setParentId(null).setShopId(shopId) addDistributionUser(new MkDistributionUser().setParentId(null).setShopId(shopId)
.setShopUserId(shopUserInfo.getId()).setOpeningMethod("付费开通")); .setShopUserId(shopUserInfo.getId()).setOpeningMethod("付费开通"));
} }
} }