fix: 支持两种利润率计算

谢茂盛
1 parent d5f54f24
Showing 13 changed files with 117 additions and 49 deletions
sql/table.sql
src/main/java/com/order/erp/common/utils/ProfitUtils.java
src/main/java/com/order/erp/controller/OrderProfitController.java
src/main/java/com/order/erp/domain/DictionaryEnum.java
src/main/java/com/order/erp/domain/dto/order/OrderProfitAnalysisDO.java
src/main/java/com/order/erp/domain/vo/OrderProfitAnalysisVo.java
src/main/java/com/order/erp/domain/vo/order/OrderProfitAnalysisFieldVO.java
src/main/java/com/order/erp/domain/vo/order/OrderProfitAnalysisVO.java
src/main/java/com/order/erp/domain/vo/order/ProfitCalculateVO.java
src/main/java/com/order/erp/service/order/OrderProfitAnalysisService.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderProfitAnalysisServiceImpl.java
@@ -47,6 +47,7 @@ CREATE TABLE `order_profit_analysis` (
 		  `packet_total_price` DOUBLE DEFAULT 0 COMMENT '包装费用合计￥',
 		  `packet_currency` varchar(32) DEFAULT NULL COMMENT '包装费货币',
 		  `exchange_rate` DOUBLE DEFAULT 0 COMMENT '汇率',
+		  `profit_type` DOUBLE DEFAULT 0 COMMENT '公式类型',
 		  `profit_rate` DOUBLE DEFAULT 0 COMMENT '利润率',
 		  `order_status`    INT          NOT NULL COMMENT '订单状态',
           `enable_flag`    INT          NOT NULL COMMENT '是否可用 10-可用 20-删除',
 package com.order.erp.common.utils;
+import com.order.erp.common.constant.Constant;
+import com.order.erp.common.exception.BusinessException;
 import com.order.erp.domain.vo.order.ProfitCalculateVO;
 import java.math.BigDecimal;
@@ -14,12 +16,46 @@ public class ProfitUtils {
     /**
      * 计算利润率
-     * 1 - (生产科总价/汇率 + 包装费用总价)/客单总价
      *
      * @param calculateVO
      * @return
      */
     public static double calculateProfitRate(ProfitCalculateVO calculateVO) {
+        if (calculateVO.getProfitType() == Constant.ZERO) {
+            return calculateProfitRate1(calculateVO);
+        } else if (calculateVO.getProfitType() == Constant.ONE) {
+            return calculateProfitRate2(calculateVO);
+        }
+        throw new BusinessException("利润公式不存在！");
+    }
+
+    /**
+     * 计算利润率 公式1
+     * 1 - (生产科总价/汇率 + 包装费用总价)/客单总价
+     *
+     * @param calculateVO
+     * @return
+     */
+    public static double calculateProfitRate1(ProfitCalculateVO calculateVO) {
+        BigDecimal productionDepartmentTotalPrice = new BigDecimal(calculateVO.getProductionDepartmentTotalPrice());
+
+        BigDecimal exchangeRate = new BigDecimal(calculateVO.getExchangeRate());
+
+        BigDecimal packetTotalPrice = new BigDecimal(calculateVO.getPacketTotalPrice());
+
+        BigDecimal customerTotalPrice = new BigDecimal(calculateVO.getCustomerTotalPrice());
+
+        return new BigDecimal(1).subtract((productionDepartmentTotalPrice.divide(exchangeRate, 4, BigDecimal.ROUND_HALF_UP).add(packetTotalPrice)).divide(customerTotalPrice, 4, BigDecimal.ROUND_HALF_UP)).doubleValue();
+    }
+
+    /**
+     * 计算利润率 公式2
+     * 1 - (生产科总价/汇率/(客户总金额-包装费用总金额)
+     *
+     * @param calculateVO
+     * @return
+     */
+    public static double calculateProfitRate2(ProfitCalculateVO calculateVO) {
         BigDecimal productionDepartmentTotalPrice = new BigDecimal(calculateVO.getProductionDepartmentTotalPrice());
         BigDecimal exchangeRate = new BigDecimal(calculateVO.getExchangeRate());
@@ -28,6 +64,12 @@ public class ProfitUtils {
         BigDecimal customerTotalPrice = new BigDecimal(calculateVO.getCustomerTotalPrice());
-        return new BigDecimal(1).subtract((productionDepartmentTotalPrice.divide(exchangeRate,4,BigDecimal.ROUND_HALF_UP).add(packetTotalPrice)).divide(customerTotalPrice,4,BigDecimal.ROUND_HALF_UP)).doubleValue();
+        BigDecimal v = customerTotalPrice.subtract(packetTotalPrice);
+
+        if (v.intValue() <= 0) {
+            throw new BusinessException("客户金额小于包装费用");
+        }
+
+        return new BigDecimal(1).subtract((productionDepartmentTotalPrice.divide(exchangeRate, 4, BigDecimal.ROUND_HALF_UP).divide(v))).doubleValue();
     }
 }
 package com.order.erp.controller;
 import com.order.erp.common.constant.ServerResult;
-import com.order.erp.domain.dto.order.OrderProfitAnalysisDO;
 import com.order.erp.domain.vo.OrderProfitAnalysisVo;
+import com.order.erp.domain.vo.order.OrderProfitAnalysisVO;
 import com.order.erp.service.order.OrderProfitAnalysisService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -11,9 +11,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
 /**
  * @author zhongnanhuang
@@ -30,15 +27,7 @@ public class OrderProfitController {
     OrderProfitAnalysisService orderProfitAnalysisService;
     @PostMapping("/analysis")
-    public ServerResult analysis(@RequestBody @Validated OrderProfitAnalysisVo orderProfitAnalysisVo){
-        List<Long> orderIds = orderProfitAnalysisVo.getOrderIds();
-
-        OrderProfitAnalysisDO orderProfitAnalysisDO = orderProfitAnalysisService.analysisByOrderIds(orderIds);
-
-        if (orderProfitAnalysisDO==null){
-            return ServerResult.fail("找不到订单信息");
-        }
-
-        return ServerResult.success(orderProfitAnalysisDO);
+    public ServerResult<OrderProfitAnalysisVO> analysis(@RequestBody @Validated OrderProfitAnalysisVo orderProfitAnalysisVo) {
+        return orderProfitAnalysisService.analysisByOrderIds(orderProfitAnalysisVo);
     }
 }
@@ -13,7 +13,7 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum DictionaryEnum {
-    EXCHANGE_RATE("exchange_rate", "汇率"),
+    EXCHANGE_RATE("exchangeRate", "汇率"),
     ;
     private String code;
@@ -84,5 +84,10 @@ public class OrderProfitAnalysisDO extends BaseDO implements Serializable {
      */
     private Integer orderStatus;
+    /**
+     * 默认 0 公式1，1 公式2
+     */
+    private int profitType;
+
 }
@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.List;
@@ -21,6 +22,17 @@ import java.util.List;
 @NoArgsConstructor
 @ToString
 public class OrderProfitAnalysisVo implements Serializable {
-    @Size(min = 1,message = "订单不能为空")
+    @Size(min = 1, message = "订单不能为空")
     private List<Long> orderIds;
+
+    /**
+     * 默认 0 公式1，1 公式2
+     */
+    private int profitType;
+
+    /**
+     * 汇率
+     */
+    @NotNull(message = "请选择当天汇率进行计算")
+    private Double exchangeRate;
 }
@@ -72,5 +72,10 @@ public class OrderProfitAnalysisFieldVO implements Serializable {
      */
     private String orderStatus;
+    /**
+     * 默认 0 公式1，1 公式2
+     */
+    private int profitType;
+
 }
@@ -81,5 +81,10 @@ public class OrderProfitAnalysisVO implements Serializable {
      */
     private Integer orderStatus;
+    /**
+     * 默认 0 公式1，1 公式2
+     */
+    private int profitType;
+
 }
@@ -36,5 +36,10 @@ public class ProfitCalculateVO implements Serializable {
      */
     private Double exchangeRate;
+    /**
+     * 默认 0 公式1，1 公式2
+     */
+    private int profitType;
+
 }
@@ -3,6 +3,7 @@ package com.order.erp.service.order;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.domain.dto.order.OrderProfitAnalysisDO;
+import com.order.erp.domain.vo.OrderProfitAnalysisVo;
 import com.order.erp.domain.vo.order.OrderProfitAnalysisQueryVO;
 import com.order.erp.domain.vo.order.OrderProfitAnalysisVO;
@@ -60,7 +61,7 @@ public interface OrderProfitAnalysisService extends IService&lt;OrderProfitAnalysis
     boolean deleteByOrderIds(List<Long> orderIds);
-    OrderProfitAnalysisDO analysisByOrderIds(List<Long> orderIds);
+    ServerResult<OrderProfitAnalysisVO> analysisByOrderIds(OrderProfitAnalysisVo orderProfitAnalysisVo);
     long countByOrderStatus(Integer status);
@@ -550,6 +550,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 && Objects.nonNull(profitAnalysisVO.getPacketTotalPrice())
                 && Objects.nonNull(profitAnalysisVO.getProductionDepartmentTotalPrice())) {
             profitRate = ProfitUtils.calculateProfitRate(ProfitCalculateVO.builder()
+                    .profitType(profitAnalysisVO.getProfitType())
                     .customerTotalPrice(profitAnalysisVO.getCustomerTotalPrice())
                     .exchangeRate(profitAnalysisVO.getExchangeRate())
                     .packetTotalPrice(profitAnalysisVO.getPacketTotalPrice())
@@ -557,6 +558,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         return OrderProfitAnalysisFieldVO.builder()
                 .orderId(profitAnalysisVO.getOrderId())
+                .profitType(profitAnalysisVO.getProfitType())
                 .customerPrice(Objects.nonNull(profitAnalysisVO.getCustomerPrice()) ? profitAnalysisVO.getCustomerPrice().toString() : null)
                 .customerTotalPrice(Objects.nonNull(profitAnalysisVO.getCustomerTotalPrice()) ? profitAnalysisVO.getCustomerTotalPrice().toString() : null)
                 .customerCurrency(profitAnalysisVO.getCustomerCurrency())
@@ -448,6 +448,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 profitAnalysisDO.setProductionDepartmentPrice(Objects.nonNull(profitAnalysisFieldVO.getProductionDepartmentPrice()) ? Double.valueOf(profitAnalysisFieldVO.getProductionDepartmentPrice()) : null);
                 profitAnalysisDO.setProductionDepartmentTotalPrice(Objects.nonNull(profitAnalysisFieldVO.getProductionDepartmentTotalPrice()) ? Double.valueOf(profitAnalysisFieldVO.getProductionDepartmentTotalPrice()) : null);
                 profitAnalysisDO.setProfitRate(Objects.nonNull(profitAnalysisFieldVO.getProfitRate()) ? Double.valueOf(profitAnalysisFieldVO.getProfitRate()) : null);
+                profitAnalysisDO.setProfitType(profitAnalysisFieldVO.getProfitType());
                 profitAnalysisService.updateById(profitAnalysisDO);
             }
             orderBaseInfoDO.setOrderStatus(OrderStatusEnum.PROFIT_AUDIT_PASS.getStatus());
@@ -481,6 +482,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
     private OrderProfitAnalysisDO profitField2profitDo(OrderProfitAnalysisFieldVO profitAnalysisFieldVO) {
         return OrderProfitAnalysisDO.builder()
                 .orderId(profitAnalysisFieldVO.getOrderId())
+                .profitType(profitAnalysisFieldVO.getProfitType())
                 .customerPrice(Objects.nonNull(profitAnalysisFieldVO.getCustomerPrice()) ? Double.valueOf(profitAnalysisFieldVO.getCustomerPrice()) : null)
                 .customerTotalPrice(Objects.nonNull(profitAnalysisFieldVO.getCustomerTotalPrice()) ? Double.valueOf(profitAnalysisFieldVO.getCustomerTotalPrice()) : null)
                 .exchangeRate(Objects.nonNull(profitAnalysisFieldVO.getExchangeRate()) ? Double.valueOf(profitAnalysisFieldVO.getExchangeRate()) : null)
@@ -2,15 +2,17 @@ package com.order.erp.service.order.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.order.erp.common.constant.Constant;
 import com.order.erp.common.constant.ServerResult;
+import com.order.erp.common.exception.BusinessException;
 import com.order.erp.common.utils.ProfitUtils;
+import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.order.OrderProfitAnalysisDO;
+import com.order.erp.domain.vo.OrderProfitAnalysisVo;
 import com.order.erp.domain.vo.order.OrderProfitAnalysisQueryVO;
 import com.order.erp.domain.vo.order.OrderProfitAnalysisVO;
 import com.order.erp.domain.vo.order.ProfitCalculateVO;
@@ -21,7 +23,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -35,7 +36,6 @@ import java.util.Objects;
 @Service
 public class OrderProfitAnalysisServiceImpl extends ServiceImpl<OrderProfitAnalysisMapper, OrderProfitAnalysisDO> implements OrderProfitAnalysisService {
-
     /**
      * 通过ID查询单条数据
      * <p>
@@ -131,6 +131,7 @@ public class OrderProfitAnalysisServiceImpl extends ServiceImpl&lt;OrderProfitAnaly
     /**
      * 通过订单id逻辑删除
+     *
      * @param orderId
      * @return
      */
@@ -151,47 +152,45 @@ public class OrderProfitAnalysisServiceImpl extends ServiceImpl&lt;OrderProfitAnaly
     }
     @Override
-    public OrderProfitAnalysisDO analysisByOrderIds(List<Long> orderIds) {
+    public ServerResult<OrderProfitAnalysisVO> analysisByOrderIds(OrderProfitAnalysisVo profitAnalysisVo) {
         //查询订单id的利润分析数据
-        QueryWrapper queryWrapper = new QueryWrapper<OrderProfitAnalysisVO>().in("order_id", orderIds);
-        List<OrderProfitAnalysisDO> orderProfits = list(queryWrapper);
-
+        List<OrderProfitAnalysisDO> orderProfits = list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(OrderProfitAnalysisDO::getOrderId, profitAnalysisVo.getOrderIds()));
-        if (orderProfits==null||orderProfits.isEmpty()){
-            return null;
+        if (CollectionUtils.isEmpty(orderProfits)) {
+            throw new BusinessException("选中的订单信息不存在");
         }
-        BigDecimal packetTotalPrice = new BigDecimal("0");
-        BigDecimal customerTotalPrice = new BigDecimal("0");
-        BigDecimal productionDepartmentTotalPrice = new BigDecimal("0");
-        double profits = 0;
-        //分别计算每个orderProfit的利润率，通过ProfitUtils的calculateProfitRate方法计算
+        BigDecimal packetTotalPrice = new BigDecimal(Constant.ZERO_STRING);
+        BigDecimal customerTotalPrice = new BigDecimal(Constant.ZERO_STRING);
+        BigDecimal productionDepartmentTotalPrice = new BigDecimal(Constant.ZERO_STRING);
         for (OrderProfitAnalysisDO orderProfit : orderProfits) {
             ProfitCalculateVO profitCalculateVO = new ProfitCalculateVO();
-            BeanUtils.copyProperties(orderProfit,profitCalculateVO);
-            double profit = ProfitUtils.calculateProfitRate(profitCalculateVO);
-
+            BeanUtils.copyProperties(orderProfit, profitCalculateVO);
             packetTotalPrice = packetTotalPrice.add(new BigDecimal(orderProfit.getPacketTotalPrice()));
             customerTotalPrice = customerTotalPrice.add(new BigDecimal(orderProfit.getCustomerTotalPrice()));
             productionDepartmentTotalPrice = productionDepartmentTotalPrice.add(new BigDecimal(orderProfit.getProductionDepartmentTotalPrice()));
-            profits+=profit;
         }
-        profits = (profits / orderProfits.size());
-
-        OrderProfitAnalysisDO orderProfitAnalysisDO = new OrderProfitAnalysisDO();
-        orderProfitAnalysisDO.setPacketTotalPrice(packetTotalPrice.doubleValue());
-        orderProfitAnalysisDO.setCustomerTotalPrice(customerTotalPrice.doubleValue());
-        orderProfitAnalysisDO.setProductionDepartmentTotalPrice(productionDepartmentTotalPrice.doubleValue());
-        orderProfitAnalysisDO.setProfitRate(profits);
-
-        return orderProfitAnalysisDO;
+        OrderProfitAnalysisVO profitAnalysisVO = new OrderProfitAnalysisVO();
+        profitAnalysisVO.setPacketTotalPrice(packetTotalPrice.doubleValue());
+        profitAnalysisVO.setCustomerTotalPrice(customerTotalPrice.doubleValue());
+        profitAnalysisVO.setProductionDepartmentTotalPrice(productionDepartmentTotalPrice.doubleValue());
+        profitAnalysisVO.setProfitRate(ProfitUtils.calculateProfitRate(ProfitCalculateVO.builder()
+                .profitType(profitAnalysisVo.getProfitType())
+                .exchangeRate(profitAnalysisVo.getExchangeRate())
+                .productionDepartmentTotalPrice(productionDepartmentTotalPrice.doubleValue())
+                .packetTotalPrice(packetTotalPrice.doubleValue())
+                .customerTotalPrice(customerTotalPrice.doubleValue()).build()));
+
+        return ServerResult.success(profitAnalysisVO);
     }
     @Override
     public long countByOrderStatus(Integer status) {
-        return this.count(new LambdaQueryWrapper<OrderProfitAnalysisDO>().eq(OrderProfitAnalysisDO::getOrderStatus,status)
-                .eq(OrderProfitAnalysisDO::getEnableFlag,Constant.ENABLE_TEN));
+        return this.count(new LambdaQueryWrapper<OrderProfitAnalysisDO>().eq(OrderProfitAnalysisDO::getOrderStatus, status)
+                .eq(OrderProfitAnalysisDO::getEnableFlag, Constant.ENABLE_TEN));
     }
     @Override