diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantProfit/impl/MerchantProfitServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantProfit/impl/MerchantProfitServiceImpl.java index 66a3a5c..ffe07d5 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantProfit/impl/MerchantProfitServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantProfit/impl/MerchantProfitServiceImpl.java @@ -139,7 +139,18 @@ public class MerchantProfitServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); - queryWrapper.eq("userId",userPromotion.getParentUserId()); - UserApp pUserApp=userAppMapper.selectOne(queryWrapper); - if(ObjectUtil.isEmpty(pUserApp)){ - log.error("订单号:{},分润结束,获取分润数为:{}",order.getOrderNumber(),profits.size()); - return; - } - BigDecimal profitAmt = profitRate.divide(BigDecimal.valueOf(100)).multiply(BigDecimal.valueOf(order.getConsumeFee())).setScale(4, BigDecimal.ROUND_DOWN); - MerchantProfit profit = new MerchantProfit(nowUserApp, pUserApp, order, profitAmt, profitRate, "5", "1"); + MerchantProfit profit = new MerchantProfit(nowUserApp, nowUserApp, order, profitAmt, profitRate, "5", "1"); profits.add(profit); - sendProfitMessage(pUserApp, profitAmt, order.getOrderNumber()); + sendProfitMessage(nowUserApp, profitAmt, order.getOrderNumber()); createUserV3Profit(order,userPromotion.getParentUserId(),profits,new BigDecimal(userPromotion.getCurrentFee())); }else { @@ -229,16 +232,8 @@ public class MerchantProfitServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); -// queryWrapper.eq("userId",userPromotion.getParentUserId()); -// UserApp pUserApp=userAppMapper.selectOne(queryWrapper); -// if(ObjectUtil.isEmpty(pUserApp)){ -// log.error("订单号:{},分润结束,获取分润数为:{}",order.getOrderNumber(),profits.size()); -// return; -// } - BigDecimal profitAmt = profitRate.divide(BigDecimal.valueOf(100)).multiply(BigDecimal.valueOf(order.getConsumeFee())).setScale(4, BigDecimal.ROUND_DOWN); - MerchantProfit profit = new MerchantProfit(nowUserApp, nowUserApp, order, profitAmt, profitRate, "5", "1"); + MerchantProfit profit = new MerchantProfit(nowUserApp,nowUserApp , order, profitAmt, profitRate, "5", "1"); profits.add(profit); sendProfitMessage(nowUserApp, profitAmt, order.getOrderNumber()); createUserV3Profit(order,userPromotion.getParentUserId(),profits,new BigDecimal(userPromotion.getCurrentFee()));