计算平台利润

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/AdminDashbordServiceImpl.java

@@ -19,6 +19,8 @@ import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
 import com.wwdz.ch.db.dao.dts.DtsUserDao;
 import com.wwdz.ch.db.dto.request.distribution.DistributorProfitRequestDto;
 import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
+import com.wwdz.ch.db.dto.request.distribution.UserAccountDetailRequestDto;
+import com.xxdxxs.utils.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +54,9 @@ public class AdminDashbordServiceImpl implements AdminDashbordService {
     @Autowired
     DistributorProfitDao distributorProfitDao;
 
+    @Autowired
+    SysFinanceServiceImpl sysFinanceService;
+
     @Override
     public Object info() {
 
@@ -118,6 +123,7 @@ public class AdminDashbordServiceImpl implements AdminDashbordService {
             distirbutionOrderDto.setEndCreateTime(endTime);
             OrderDataStat distirbutionOrderDataStat = distributorProfitDao.countOrderData(distirbutionOrderDto);
 
+
             Map<String, Object> distributionOrderData = new HashMap<>();
             distributionOrderData.put("totalAmount", PriceUtil.convertPriceFenToYuan(distirbutionOrderDataStat.getTotalAmount()));
             distributionOrderData.put("totalOrderNum", distirbutionOrderDataStat.getTotalOrderNum());
@@ -125,6 +131,16 @@ public class AdminDashbordServiceImpl implements AdminDashbordService {
             double channelDistributionProfit = distirbutionOrderDataStat.getTotalAmount().doubleValue() - distributorProfit;
             distributionOrderData.put("totalProfit", PriceUtil.convertDoubleToString(channelDistributionProfit));
             dataPanelVo.setDistributionOrderData(distributionOrderData);
+
+
+            UserAccountDetailRequestDto userAccountDetailRequestDto = new UserAccountDetailRequestDto();
+            userAccountDetailRequestDto.setStartCreateTime(DateUtils.parseString(startTimeStr));
+            userAccountDetailRequestDto.setEndCreateTime(DateUtils.parseString(endTimeStr));
+            Result financeResult =sysFinanceService.findSystemBillIncomeDetail(userAccountDetailRequestDto);
+            Map<String, Object> map = (Map<String, Object>) financeResult.getData();
+            String totalAmount = (String) map.get("amount");
+
+
             return Result.success(dataPanelVo);
         } catch (Exception e) {
             logger.error("查询数据看板 error:{}", e);

ch-dao/src/main/java/com/wwdz/ch/db/bean/OrderDataStat.java

@@ -20,4 +20,9 @@ public class OrderDataStat implements Entity {
      * 分销商的总利润
      */
     private Long totalProfit;
+
+    /**
+     * 平台总利润
+     */
+    private Long totalChannelCost;
 }

ch-dao/src/main/resources/com/wwdz/ch/db/mapper/distribution/DistributorProfitMapper.xml

@@ -462,7 +462,7 @@
   </select>
 
   <select id="countOrderData" parameterType="com.wwdz.ch.db.domain.distribution.DistributorProfitExample" resultType="com.wwdz.ch.db.bean.OrderDataStat">
-    select  IFNULL(sum(amount), 0) as totalAmount, count(distribution_order_id) as totalOrderNum,  IFNULL(sum(profit), 0) from distributor_profit
+    select  IFNULL(sum(amount), 0) as totalAmount, IFNULL(sum(channel_cost), 0) as totalChannelCost, count(distribution_order_id) as totalOrderNum,  IFNULL(sum(profit), 0) from distributor_profit
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>