canrd-outside / order-erp · Commits

Commit d5a76411b00ba0aba6c74026218d40ab5bc7b66c

Authored by qdlgxiemaosheng
1 parent 9ba20132
build: skipped

feat:利润率计算

Inline Side-by-side
Showing 3 changed files with 14 additions and 0 deletions
src/main/java/com/order/erp/controller/OrderProfitController.java
  View file @d5a7641
@@ -3,6 +3,7 @@ package com.order.erp.controller; @@ -3,6 +3,7 @@ package com.order.erp.controller;
3 import com.order.erp.common.constant.ServerResult; 3 import com.order.erp.common.constant.ServerResult;
4 import com.order.erp.domain.vo.OrderProfitAnalysisVo; 4 import com.order.erp.domain.vo.OrderProfitAnalysisVo;
5 import com.order.erp.domain.vo.order.OrderProfitAnalysisVO; 5 import com.order.erp.domain.vo.order.OrderProfitAnalysisVO;
  6 +import com.order.erp.domain.vo.order.ProfitCalculateVO;
6 import com.order.erp.service.order.OrderProfitAnalysisService; 7 import com.order.erp.service.order.OrderProfitAnalysisService;
7 import org.springframework.validation.annotation.Validated; 8 import org.springframework.validation.annotation.Validated;
8 import org.springframework.web.bind.annotation.PostMapping; 9 import org.springframework.web.bind.annotation.PostMapping;
@@ -30,4 +31,9 @@ public class OrderProfitController { @@ -30,4 +31,9 @@ public class OrderProfitController {
30 public ServerResult<OrderProfitAnalysisVO> analysis(@RequestBody @Validated OrderProfitAnalysisVo orderProfitAnalysisVo) { 31 public ServerResult<OrderProfitAnalysisVO> analysis(@RequestBody @Validated OrderProfitAnalysisVo orderProfitAnalysisVo) {
31 return orderProfitAnalysisService.analysisByOrderIds(orderProfitAnalysisVo); 32 return orderProfitAnalysisService.analysisByOrderIds(orderProfitAnalysisVo);
32 } 33 }
  34 +
  35 + @PostMapping("/calculate")
  36 + public ServerResult calculate(@RequestBody @Validated ProfitCalculateVO calculateVO) {
  37 + return orderProfitAnalysisService.calculate(calculateVO);
  38 + }
33 } 39 }
src/main/java/com/order/erp/service/order/OrderProfitAnalysisService.java
  View file @d5a7641
@@ -6,6 +6,7 @@ import com.order.erp.domain.dto.order.OrderProfitAnalysisDO; @@ -6,6 +6,7 @@ import com.order.erp.domain.dto.order.OrderProfitAnalysisDO;
6 import com.order.erp.domain.vo.OrderProfitAnalysisVo; 6 import com.order.erp.domain.vo.OrderProfitAnalysisVo;
7 import com.order.erp.domain.vo.order.OrderProfitAnalysisQueryVO; 7 import com.order.erp.domain.vo.order.OrderProfitAnalysisQueryVO;
8 import com.order.erp.domain.vo.order.OrderProfitAnalysisVO; 8 import com.order.erp.domain.vo.order.OrderProfitAnalysisVO;
  9 +import com.order.erp.domain.vo.order.ProfitCalculateVO;
9 10
10 import java.util.List; 11 import java.util.List;
11 12
@@ -63,6 +64,8 @@ public interface OrderProfitAnalysisService extends IService&lt;OrderProfitAnalysis @@ -63,6 +64,8 @@ public interface OrderProfitAnalysisService extends IService&lt;OrderProfitAnalysis
63 64
64 ServerResult<OrderProfitAnalysisVO> analysisByOrderIds(OrderProfitAnalysisVo orderProfitAnalysisVo); 65 ServerResult<OrderProfitAnalysisVO> analysisByOrderIds(OrderProfitAnalysisVo orderProfitAnalysisVo);
65 66
  67 + ServerResult calculate(ProfitCalculateVO calculateVO);
  68 +
66 long countByOrderStatus(Integer status); 69 long countByOrderStatus(Integer status);
67 70
68 long countRecentWeekByOrderStatus(Integer status); 71 long countRecentWeekByOrderStatus(Integer status);
src/main/java/com/order/erp/service/order/impl/OrderProfitAnalysisServiceImpl.java
  View file @d5a7641
@@ -153,6 +153,11 @@ public class OrderProfitAnalysisServiceImpl extends ServiceImpl&lt;OrderProfitAnaly @@ -153,6 +153,11 @@ public class OrderProfitAnalysisServiceImpl extends ServiceImpl&lt;OrderProfitAnaly
153 } 153 }
154 154
155 @Override 155 @Override
  156 + public ServerResult calculate(ProfitCalculateVO calculateVO) {
  157 + return ServerResult.success(ProfitUtils.calculateProfitRate(calculateVO));
  158 + }
  159 +
  160 + @Override
156 public ServerResult<OrderProfitAnalysisVO> analysisByOrderIds(OrderProfitAnalysisVo profitAnalysisVo) { 161 public ServerResult<OrderProfitAnalysisVO> analysisByOrderIds(OrderProfitAnalysisVo profitAnalysisVo) {
157 //查询订单id的利润分析数据 162 //查询订单id的利润分析数据
158 List<OrderProfitAnalysisDO> orderProfits = list(new LambdaQueryWrapper<OrderProfitAnalysisDO>() 163 List<OrderProfitAnalysisDO> orderProfits = list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()