feat:利润率计算/利润分析新增两列字段（客户单价/总价人民币）

qdlgxiemaosheng
1 parent d5a76411
Showing 6 changed files with 39 additions and 0 deletions
sql/dml_20231223.sql
src/main/java/com/order/erp/domain/dto/order/OrderProfitAnalysisDO.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/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
+alter table `order_profit_analysis` add column  `customer_rmb_price` DOUBLE DEFAULT 0 COMMENT '客户单价￥';
+alter table `order_profit_analysis` add column  `customer_rmb_total_price` DOUBLE DEFAULT 0 COMMENT '客户总价￥';
 \ No newline at end of file
@@ -38,6 +38,15 @@ public class OrderProfitAnalysisDO extends BaseDO implements Serializable {
     private Double customerTotalPrice;
     /**
+     * 客户单价￥
+     */
+    private Double customerRmbPrice;
+    /**
+     * 客户总价￥
+     */
+    private Double customerRmbTotalPrice;
+
+    /**
      * 客户价格货币
      */
     private String customerCurrency;
@@ -22,6 +22,14 @@ public class OrderProfitAnalysisFieldVO implements Serializable {
      */
     private Long orderId;
     /**
+     * 客户单价￥
+     */
+    private String customerRmbPrice;
+    /**
+     * 客户总价￥
+     */
+    private String customerRmbTotalPrice;
+    /**
      * 客户单价$
      */
     private String customerPrice;
@@ -34,6 +34,16 @@ public class OrderProfitAnalysisVO implements Serializable {
      */
     private Double customerTotalPrice;
+
+    /**
+     * 客户单价￥
+     */
+    private Double customerRmbPrice;
+    /**
+     * 客户总价￥
+     */
+    private Double customerRmbTotalPrice;
+
     /**
      * 客户价格货币
      */
@@ -351,6 +351,14 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                         OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getCustomerTotalPrice())) {
                     map.put("客户总价$", profitAnalysisVO.getCustomerTotalPrice());
                 }
+                if (StringUtils.isNotBlank(profitAnalysisFields.getCustomerRmbPrice()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getCustomerRmbPrice())) {
+                    map.put("客户单价￥", profitAnalysisVO.getCustomerRmbPrice());
+                }
+                if (StringUtils.isNotBlank(profitAnalysisFields.getCustomerRmbTotalPrice()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getCustomerRmbTotalPrice())) {
+                    map.put("客户总价￥", profitAnalysisVO.getCustomerRmbTotalPrice());
+                }
                 if (StringUtils.isNotBlank(profitAnalysisFields.getProductionDepartmentPrice()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getProductionDepartmentPrice())) {
                     map.put("生成科单价￥", profitAnalysisVO.getProductionDepartmentPrice());
@@ -449,6 +449,8 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 profitAnalysisService.save(profitAnalysisDO);
             } else {
                 profitAnalysisDO.setOrderStatus(OrderStatusEnum.PROFIT_AUDIT_PASS.getStatus());
+                profitAnalysisDO.setCustomerRmbPrice(Objects.nonNull(profitAnalysisFieldVO.getCustomerRmbPrice()) ? Double.valueOf(profitAnalysisFieldVO.getCustomerRmbPrice()) : null);
+                profitAnalysisDO.setCustomerRmbTotalPrice(Objects.nonNull(profitAnalysisFieldVO.getCustomerRmbTotalPrice()) ? Double.valueOf(profitAnalysisFieldVO.getCustomerRmbTotalPrice()) : null);
                 profitAnalysisDO.setCustomerPrice(Objects.nonNull(profitAnalysisFieldVO.getCustomerPrice()) ? Double.valueOf(profitAnalysisFieldVO.getCustomerPrice()) : null);
                 profitAnalysisDO.setCustomerTotalPrice(Objects.nonNull(profitAnalysisFieldVO.getCustomerTotalPrice()) ? Double.valueOf(profitAnalysisFieldVO.getCustomerTotalPrice()) : null);
                 profitAnalysisDO.setCustomerCurrency(StringUtils.isNotBlank(profitAnalysisFieldVO.getCustomerCurrency()) ? profitAnalysisFieldVO.getCustomerCurrency() : null);