diff --git a/sql/dml_20231223.sql b/sql/dml_20231223.sql new file mode 100644 index 0000000..80a772b --- /dev/null +++ b/sql/dml_20231223.sql @@ -0,0 +1,2 @@ +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 diff --git a/src/main/java/com/order/erp/domain/dto/order/OrderProfitAnalysisDO.java b/src/main/java/com/order/erp/domain/dto/order/OrderProfitAnalysisDO.java index 4c788f4..fca8c7e 100644 --- a/src/main/java/com/order/erp/domain/dto/order/OrderProfitAnalysisDO.java +++ b/src/main/java/com/order/erp/domain/dto/order/OrderProfitAnalysisDO.java @@ -38,6 +38,15 @@ public class OrderProfitAnalysisDO extends BaseDO implements Serializable { private Double customerTotalPrice; /** + * 客户单价¥ + */ + private Double customerRmbPrice; + /** + * 客户总价¥ + */ + private Double customerRmbTotalPrice; + + /** * 客户价格货币 */ private String customerCurrency; diff --git a/src/main/java/com/order/erp/domain/vo/order/OrderProfitAnalysisFieldVO.java b/src/main/java/com/order/erp/domain/vo/order/OrderProfitAnalysisFieldVO.java index 992145e..f66f69c 100644 --- a/src/main/java/com/order/erp/domain/vo/order/OrderProfitAnalysisFieldVO.java +++ b/src/main/java/com/order/erp/domain/vo/order/OrderProfitAnalysisFieldVO.java @@ -22,6 +22,14 @@ public class OrderProfitAnalysisFieldVO implements Serializable { */ private Long orderId; /** + * 客户单价¥ + */ + private String customerRmbPrice; + /** + * 客户总价¥ + */ + private String customerRmbTotalPrice; + /** * 客户单价$ */ private String customerPrice; diff --git a/src/main/java/com/order/erp/domain/vo/order/OrderProfitAnalysisVO.java b/src/main/java/com/order/erp/domain/vo/order/OrderProfitAnalysisVO.java index b9276aa..2156dfd 100644 --- a/src/main/java/com/order/erp/domain/vo/order/OrderProfitAnalysisVO.java +++ b/src/main/java/com/order/erp/domain/vo/order/OrderProfitAnalysisVO.java @@ -34,6 +34,16 @@ public class OrderProfitAnalysisVO implements Serializable { */ private Double customerTotalPrice; + + /** + * 客户单价¥ + */ + private Double customerRmbPrice; + /** + * 客户总价¥ + */ + private Double customerRmbTotalPrice; + /** * 客户价格货币 */ diff --git a/src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java b/src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java index ba272c0..38ee599 100644 --- a/src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java +++ b/src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java @@ -351,6 +351,14 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<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()); diff --git a/src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java b/src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java index 30f8de7..64a030b 100644 --- a/src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java +++ b/src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java @@ -449,6 +449,8 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl<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);