dd

ruoyi-line/src/main/java/com/ruoyi/onlineorder/service/impl/OnlineOrderServiceImpl.java

@@ -84,8 +84,6 @@ public class OnlineOrderServiceImpl implements IOnlineOrderService {
     @Resource
     private IUserBusinessRoleService userBusinessRoleService;
 
-    private final IRevenueSharingConfigService iRevenueSharingConfigService;
-
     /**
      * 查询在线订单分页
      *
@@ -297,20 +295,6 @@ public class OnlineOrderServiceImpl implements IOnlineOrderService {
             if (!OnlinePayStatus.PAYED.equals(order.getPayStatus())) {
                 return null;
             }
-
-            RevenueSharingConfigVo config = iRevenueSharingConfigService.getInfo();
-            BigDecimal onlineOrderServiceFeeRatio = config.getOnlineOrderServiceFeeRatio();
-            BigDecimal onlineOrderServiceFee = MathUtils.setScale(order.getPayAmount().doubleValue() * onlineOrderServiceFeeRatio.doubleValue() / 100);
-            businessService.changeBalance(BusinessBalanceRecordBo.builder()
-                    .billType(BusinessBillType.IN)
-                    .businessId(order.getBusinessId())
-                    .entryValue(order.getPayAmount().subtract(onlineOrderServiceFeeRatio))
-                    .sourceType(BusinessSourceType.USER_ONLINE_ORDER)
-                    .sourceId(order.getOrderId())
-                    .sourceCode(order.getOrderNo())
-                    .remark(String.format("用户在线下单,订单金额%s,平台服务费：%s", order.getPayAmount(), onlineOrderServiceFee))
-                .build());
-
             //开始送积分和排队
             subsidyQueueService.createQueue(order);
             return order;

ruoyi-line/src/main/java/com/ruoyi/subsidy/service/impl/SubsidyQueueServiceImpl.java

@@ -3,6 +3,8 @@ package com.ruoyi.subsidy.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.ruoyi.base.revenue.domain.vo.RevenueSharingConfigVo;
+import com.ruoyi.base.revenue.service.IRevenueSharingConfigService;
 import com.ruoyi.business.domain.bo.BusinessBalanceRecordBo;
 import com.ruoyi.business.enums.BusinessBillType;
 import com.ruoyi.business.enums.BusinessSourceType;
@@ -94,6 +96,8 @@ public class SubsidyQueueServiceImpl implements ISubsidyQueueService {
     @Resource
     private IUserBusinessRoleService userBusinessRoleService;
 
+
+    private final IRevenueSharingConfigService iRevenueSharingConfigService;
     /**
      * 查询补贴排队分页
      *
@@ -321,17 +325,20 @@ public class SubsidyQueueServiceImpl implements ISubsidyQueueService {
             }
         }
 
-        // 有了商家的实际补贴金额，就可以计算商家当前这个订单的实际所得
-        // 实际所得 = 订单金额- 平台服务费（5%）- (商家补贴金额（让利）-补贴返还)
+
+        RevenueSharingConfigVo config = iRevenueSharingConfigService.getInfo();
+        BigDecimal onlineOrderServiceFeeRatio = config.getOnlineOrderServiceFeeRatio();
+        BigDecimal onlineOrderServiceFee = MathUtils.setScale(order.getPayAmount().doubleValue() * onlineOrderServiceFeeRatio.doubleValue() / 100);
         businessService.changeBalance(BusinessBalanceRecordBo.builder()
-            .billType(BusinessBillType.OUT)
+            .billType(BusinessBillType.IN)
             .businessId(order.getBusinessId())
-            .entryValue(shouldSubsidyAmount)
-            .sourceType(BusinessSourceType.USER_QUEUE_SUBSIDY)
+            .entryValue(order.getPayAmount().subtract(onlineOrderServiceFeeRatio).subtract(shouldSubsidyAmount))
+            .sourceType(BusinessSourceType.USER_ONLINE_ORDER)
             .sourceId(order.getOrderId())
             .sourceCode(order.getOrderNo())
-            .remark(String.format("用户在线下单,商家补贴让利%s", shouldSubsidyAmount))
+            .remark(String.format("用户在线下单,订单金额%s,平台服务费：%s,商家让利：%s", order.getPayAmount(), onlineOrderServiceFee,shouldSubsidyAmount))
             .build());
+
     }
 
     @Override