配置中心—配置管理—问卷配置App端接口--首页-今日接单数、今日预估收益

clx-performance-web/src/main/java/com/clx/performance/controller/app/AppGoodsOrderController.java

 package com.clx.performance.controller.app;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.clx.performance.mapper.OrderGoodsMapper;
-import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.app.AppGoodsOrderSearchParam;
 import com.clx.performance.param.app.OrderGoodsListPageParam;
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.service.OrderGoodsTruckBindService;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
+import com.clx.performance.vo.app.OrderGoodsTodaySumVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
-import com.msl.user.data.UserSessionData;
-import com.msl.user.utils.TokenUtil;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -77,9 +73,10 @@ public class AppGoodsOrderController {
         return Result.ok(orderGoodsTruckBindService.getCancelOrderGoods(userNo));
     }
 
-    @Operation(summary = "司机端获取当日已接单（包含已取消）", description = "br>By:马路路")
+    @Operation(summary = "司机端获取当日已接单（包含已取消）、今日预估利润", description = "br>By:马路路")
     @GetMapping("/getTodayOrderGoodsSum")
-    public Result<Integer> getTodayOrderGoodsSum () {
+    @UnitCovert(param = false)
+    public Result<OrderGoodsTodaySumVO> getTodayOrderGoodsSum () {
         return Result.ok(orderGoodsService.getTodayOrderGoodsSum());
     }
 }

clx-performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dto.CancelOrderGoodsWeightDTO;
 import com.clx.performance.dto.OrderGoodsNotCancelChildDTO;
+import com.clx.performance.dto.OrderGoodsTodaySumDTO;
 import com.clx.performance.dto.linewarn.LineWarnOrderChildStatisticsDTO;
 import com.clx.performance.mapper.OrderChildMapper;
 import com.clx.performance.model.OrderChild;
@@ -218,5 +219,5 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     int countTakeByOrderGoodsNo(String orderGoodsNo);
     int countLoadByOrderGoodsNo(String orderGoodsNo);
 
-    int countTodayOrderGoodsSumByUserNo(Long userNo);
+    OrderGoodsTodaySumDTO countTodayOrderGoodsSumByUserNo(Long userNo);
 }

clx-performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dto.CancelOrderGoodsWeightDTO;
 import com.clx.performance.dto.OrderGoodsNotCancelChildDTO;
+import com.clx.performance.dto.OrderGoodsTodaySumDTO;
 import com.clx.performance.dto.linewarn.LineWarnOrderChildStatisticsDTO;
 import com.clx.performance.enums.OrderChildEnum;
 import com.clx.performance.mapper.OrderChildMapper;
@@ -723,7 +724,7 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     }
 
     @Override
-    public int countTodayOrderGoodsSumByUserNo(Long userNo) {
+    public OrderGoodsTodaySumDTO countTodayOrderGoodsSumByUserNo(Long userNo) {
         return baseMapper.countTodayOrderGoodsSumByUserNo(userNo);
     }
 }

clx-performance-web/src/main/java/com/clx/performance/dto/OrderGoodsTodaySumDTO.java

+package com.clx.performance.dto;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class OrderGoodsTodaySumDTO {
+    @Schema(description="今日已接单数")
+    private Integer todayOrderGoodsSum;
+
+    @Schema(description="今日预估利润")
+    @MoneyOutConvert
+    private BigDecimal todayEstimateProfit;
+}

clx-performance-web/src/main/java/com/clx/performance/mapper/OrderChildMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dto.CancelOrderGoodsWeightDTO;
 import com.clx.performance.dto.OrderGoodsNotCancelChildDTO;
+import com.clx.performance.dto.OrderGoodsTodaySumDTO;
 import com.clx.performance.dto.linewarn.LineWarnOrderChildStatisticsDTO;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.param.app.PageOrderChildOfDriverParam;
@@ -192,8 +193,8 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
             " where order_goods_no=#{orderGoodsNo} and status in(50,60,70,80,90,100)")
     int countLoadByOrderGoodsNo(@Param("orderGoodsNo") String orderGoodsNo);
 
-    @Select("select count(*) from order_child " +
-            " where user_no=#{userNo} and status in(10,110) AND create_time >= CURDATE()\n" +
+    @Select("select count(*) AS todayOrderGoodsSum, IFNULL(SUM(freight),0) AS todayEstimateProfit from order_child " +
+            " where user_no=#{userNo} and status in(10,110) AND create_time >= CURDATE()" +
             "  AND create_time <= CURDATE() + INTERVAL 1 DAY - INTERVAL 1 SECOND")
-    int countTodayOrderGoodsSumByUserNo(Long userNo);
+    OrderGoodsTodaySumDTO countTodayOrderGoodsSumByUserNo(Long userNo);
 }
\ No newline at end of file

clx-performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java

@@ -8,8 +8,8 @@ import com.clx.performance.param.app.OrderGoodsListPageParam;
 import com.clx.performance.param.feign.CancelOrderGoodsParam;
 import com.clx.performance.param.feign.DistributionTruckParam;
 import com.clx.performance.param.pc.*;
-import com.clx.performance.param.pc.carrier.PageSettlementOrderChildRiskParam;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
+import com.clx.performance.vo.app.OrderGoodsTodaySumVO;
 import com.clx.performance.vo.feign.FreightEstimateVO;
 import com.clx.performance.vo.feign.OrderGoodsFeignVO;
 import com.clx.performance.vo.pc.DriverFreightPriceVO;
@@ -116,5 +116,5 @@ public interface OrderGoodsService {
 
     BigDecimal calcOrderGoodsResidueWeight(BigDecimal extractWeight,BigDecimal alreadyWeight);
 
-    Integer getTodayOrderGoodsSum();
+    OrderGoodsTodaySumVO getTodayOrderGoodsSum();
 }

clx-performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -20,9 +20,8 @@ import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.*;
 import com.clx.performance.dto.OrderGoodsBindTruckNumDTO;
 import com.clx.performance.dto.OrderGoodsCancelDTO;
+import com.clx.performance.dto.OrderGoodsTodaySumDTO;
 import com.clx.performance.enums.*;
-import com.clx.performance.enums.settle.SettlementOrderChildRiskEnum;
-import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.enums.settle.SettlementWayEnum;
 import com.clx.performance.extranal.order.QuotationService;
 import com.clx.performance.extranal.user.DriverService;
@@ -41,6 +40,7 @@ import com.clx.performance.utils.excel.ExcelField;
 import com.clx.performance.utils.excel.ExcelSheet;
 import com.clx.performance.utils.excel.ExcelUtil;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
+import com.clx.performance.vo.app.OrderGoodsTodaySumVO;
 import com.clx.performance.vo.feign.FreightEstimateVO;
 import com.clx.performance.vo.feign.OrderExtractWeightVO;
 import com.clx.performance.vo.feign.OrderGoodsFeignVO;
@@ -49,7 +49,6 @@ import com.clx.performance.vo.pc.DriverFreightPriceVO;
 import com.clx.performance.vo.pc.OrderGoodsEditVO;
 import com.clx.performance.vo.pc.OrderGoodsPendingVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
-import com.clx.performance.vo.pc.carrier.settle.SettlementOrderChildRiskVO;
 import com.clx.user.enums.driver.DriverInfoEnum;
 import com.clx.user.feign.UserClxFeign;
 import com.msl.common.base.Optional;
@@ -1075,8 +1074,12 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
     }
 
     @Override
-    public Integer getTodayOrderGoodsSum() {
-        return orderChildDao.countTodayOrderGoodsSumByUserNo(TokenUtil.getLoginUserInfo().getUserNo());
+    public OrderGoodsTodaySumVO getTodayOrderGoodsSum() {
+        OrderGoodsTodaySumVO vo = new OrderGoodsTodaySumVO();
+        OrderGoodsTodaySumDTO dto = orderChildDao.countTodayOrderGoodsSumByUserNo(TokenUtil.getLoginUserInfo().getUserNo());
+        vo.setTodayOrderGoodsSum(dto.getTodayOrderGoodsSum());
+        vo.setTodayEstimateProfit(dto.getTodayEstimateProfit());
+        return vo;
     }
 
 

performance-api/src/main/java/com/clx/performance/vo/app/OrderGoodsTodaySumVO.java

+package com.clx.performance.vo.app;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class OrderGoodsTodaySumVO {
+
+    @Schema(description="今日已接单数")
+    private Integer todayOrderGoodsSum;
+
+    @Schema(description="今日预估利润")
+    @MoneyOutConvert
+    private BigDecimal todayEstimateProfit;
+}