fix: 补齐利润分析字段

谢茂盛
1 parent 90083703
Showing 4 changed files with 50 additions and 5 deletions
sql/table.sql
src/main/java/com/order/erp/domain/dto/order/OrderProfitAnalysisDO.java
src/main/java/com/order/erp/domain/vo/order/OrderProfitAnalysisVO.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
@@ -39,10 +39,13 @@ CREATE TABLE `order_profit_analysis` (
           `order_id` bigint NOT NULL COMMENT '订单id',
           `customer_price` DOUBLE DEFAULT 0 COMMENT '客户单价$',
 		  `customer_total_price` DOUBLE DEFAULT 0 COMMENT '客户总价$',
+		  `customer_currency` varchar(32) DEFAULT NULL COMMENT '客户价格货币',
 		  `production_department_price` DOUBLE DEFAULT 0 COMMENT '生成科单价￥',
 		  `production_department_total_price` DOUBLE DEFAULT 0 COMMENT '生成科总价￥',
+		  `production_department_currency` varchar(32) DEFAULT NULL COMMENT '生成科货币',
 		  `packet_price` DOUBLE DEFAULT 0 COMMENT '包装费用￥',
 		  `packet_total_price` DOUBLE DEFAULT 0 COMMENT '包装费用合计￥',
+		  `packet_currency` varchar(32) DEFAULT NULL COMMENT '包装费货币',
 		  `exchange_rate` DOUBLE DEFAULT 0 COMMENT '汇率',
 		  `profit_rate` DOUBLE DEFAULT 0 COMMENT '利润率',
 		  `order_status`    INT          NOT NULL COMMENT '订单状态',
@@ -36,6 +36,12 @@ public class OrderProfitAnalysisDO extends BaseDO implements Serializable {
      * 客户总价$
      */
     private Double customerTotalPrice;
+
+    /**
+     * 客户价格货币
+     */
+    private String customerCurrency;
+
     /**
      * 生成科单价￥
      */
@@ -44,6 +50,12 @@ public class OrderProfitAnalysisDO extends BaseDO implements Serializable {
      * 生成科总价￥
      */
     private Double productionDepartmentTotalPrice;
+
+    /**
+     * 生成科货币
+     */
+    private String productionDepartmentCurrency;
+
     /**
      * 包装费用￥
      */
@@ -52,6 +64,12 @@ public class OrderProfitAnalysisDO extends BaseDO implements Serializable {
      * 包装费用合计￥
      */
     private Double packetTotalPrice;
+
+    /**
+     * 包装费货币
+     */
+    private String packetCurrency;
+
     /**
      * 汇率
      */
@@ -33,6 +33,12 @@ public class OrderProfitAnalysisVO implements Serializable {
      * 客户总价$
      */
     private Double customerTotalPrice;
+
+    /**
+     * 客户价格货币
+     */
+    private String customerCurrency;
+
     /**
      * 生成科单价￥
      */
@@ -41,6 +47,12 @@ public class OrderProfitAnalysisVO implements Serializable {
      * 生成科总价￥
      */
     private Double productionDepartmentTotalPrice;
+
+    /**
+     * 生成科货币
+     */
+    private String productionDepartmentCurrency;
+
     /**
      * 包装费用￥
      */
@@ -49,6 +61,12 @@ public class OrderProfitAnalysisVO implements Serializable {
      * 包装费用合计￥
      */
     private Double packetTotalPrice;
+
+    /**
+     * 包装费货币
+     */
+    private String packetCurrency;
+
     /**
      * 汇率
      */
@@ -546,11 +546,17 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             BeanUtils.copyProperties(profitAnalysisVO, profitAnalysisDO);
             profitAnalysisDO.setOrderId(baseInfoDO.getId());
             profitAnalysisDO.setOrderStatus(OrderStatusEnum.PROFIT_WAIT_AUDIT.getStatus());
-            profitAnalysisDO.setProfitRate(ProfitUtils.calculateProfitRate(ProfitCalculateVO.builder()
-                    .customerTotalPrice(profitAnalysisDO.getCustomerTotalPrice())
-                    .exchangeRate(profitAnalysisDO.getExchangeRate())
-                    .packetTotalPrice(profitAnalysisDO.getPacketTotalPrice())
-                    .productionDepartmentTotalPrice(profitAnalysisDO.getProductionDepartmentTotalPrice()).build()));
+            if (Objects.nonNull(profitAnalysisDO.getCustomerTotalPrice())
+                    && Objects.nonNull(profitAnalysisDO.getExchangeRate())
+                    && Objects.nonNull(profitAnalysisDO.getPacketTotalPrice())
+                    && Objects.nonNull(profitAnalysisDO.getProductionDepartmentTotalPrice())) {
+                profitAnalysisDO.setProfitRate(ProfitUtils.calculateProfitRate(ProfitCalculateVO.builder()
+                        .customerTotalPrice(profitAnalysisDO.getCustomerTotalPrice())
+                        .exchangeRate(profitAnalysisDO.getExchangeRate())
+                        .packetTotalPrice(profitAnalysisDO.getPacketTotalPrice())
+                        .productionDepartmentTotalPrice(profitAnalysisDO.getProductionDepartmentTotalPrice()).build()));
+            }
+
             profitAnalysisService.save(profitAnalysisDO);
         }