Merge remote-tracking branch 'origin/profit-analysis' into fix-main-ch

chenhang4442024
2 parents d432e447 c1876224
Showing 6 changed files with 31 additions and 14 deletions
src/main/java/com/order/erp/controller/OrderCostController.java
src/main/java/com/order/erp/domain/vo/order/BusinessProfitDetailVO.java
src/main/java/com/order/erp/domain/vo/order/BusinessProfitInfoVO.java
src/main/java/com/order/erp/domain/vo/order/InnerProfitDetailVO.java
src/main/java/com/order/erp/service/order/impl/OrderCostInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/ProjectBaseInfoServiceImpl.java
 package com.order.erp.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.domain.vo.OrderProfitAnalysisVo;
 import com.order.erp.domain.vo.order.*;
@@ -35,13 +36,13 @@ public class OrderCostController {
     @PostMapping("/InnerProfitDetail/listByPage")
     @ApiOperation("内部生产费用明细表")
-    public ServerResult listInnerProfitDetailByPage(@RequestBody @Validated OrderBaseInfoQueryVO queryVO) {
+    public ServerResult<Page<InnerProfitDetailVO>> listInnerProfitDetailByPage(@RequestBody @Validated OrderBaseInfoQueryVO queryVO) {
         queryVO.setProductionDepartment(Collections.singletonList("内部"));
         return orderCostInfoService.listInnerProfitDetailByPage(queryVO);
     }
     @PostMapping("/BusinessProfitDetail/listByPage")
     @ApiOperation("包装费用明细表")
-    public ServerResult listBusinessProfitDetailsByPage(@RequestBody @Validated OrderBaseInfoQueryVO queryVO) {
+    public ServerResult<Page<BusinessProfitDetailVO>> listBusinessProfitDetailsByPage(@RequestBody @Validated OrderBaseInfoQueryVO queryVO) {
         return orderCostInfoService.listBusinessProfitDetailByPage(queryVO);
     }
     @PostMapping("/edit")
@@ -31,6 +31,12 @@ public class BusinessProfitDetailVO implements Serializable {
     /**
      * 项目号
      */
+    @ApiModelProperty(value = "订单id")
+    private Long orderId;
+
+    /**
+     * 项目号
+     */
     @ApiModelProperty(value = "项目号")
     private String projectNo;
@@ -83,15 +89,15 @@ public class BusinessProfitDetailVO implements Serializable {
     private BigDecimal packetActualRmbTotalPrice;
     /**
-     * 包装费用实际金额￥
+     * 实际跟单单价￥
      */
-    @ApiModelProperty(value = "包装费用实际金额（人民币）")
+    @ApiModelProperty(value = "实际跟单单价（人民币）")
     private BigDecimal packetActualRmbPrice;
     /**
-     * 包装费用实际金额$
+     * 实际跟单单价$
      */
-    @ApiModelProperty(value = "包装费用实际金额（美元）")
+    @ApiModelProperty(value = "实际跟单单价（美元）")
     private BigDecimal packetActualPrice;
     /**
@@ -204,9 +204,9 @@ public class BusinessProfitInfoVO implements Serializable {
     private BigDecimal developmentProfit;
     /**
-     * 研发净利率
+     * 净利润率
      */
-    @ApiModelProperty(value = "研发净利率")
+    @ApiModelProperty(value = "净利润率")
     private BigDecimal developmentProfitRate;
     /**
@@ -22,7 +22,11 @@ import java.util.Map;
 @SuperBuilder
 public class InnerProfitDetailVO implements Serializable {
-
+    /**
+     * 订单id
+     */
+    @ApiModelProperty(value = "订单id")
+    private Long orderId;
     /**
      * 客户编码
      */
@@ -23,6 +23,7 @@ import com.order.erp.domain.model.OrderCostFieldLockRecord;
 import com.order.erp.domain.vo.order.*;
 import com.order.erp.mapper.order.OrderCostInfoMapper;
 import com.order.erp.service.IOrderCostFieldLockRecordService;
+import com.order.erp.service.SystemSettingService;
 import com.order.erp.service.order.IOrderCostInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.order.erp.service.order.OrderBaseInfoService;
@@ -61,6 +62,8 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
     private OrderBaseInfoService orderBaseInfoService;
     @Autowired
     private IOrderCostFieldLockRecordService orderCostFieldLockRecordService;
+    @Autowired
+    private SystemSettingService systemSettingService;
     @Override
     public ServerResult edit(OrderCostInfoVO vo) {
@@ -125,6 +128,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
         }));
         List<InnerProfitDetailVO> innerProfitRatioResultVOs = records.stream().map(record -> {
             InnerProfitDetailVO vo = InnerProfitDetailVO.builder()
+                    .orderId(record.getId())
                     .customerCode(record.getCustomerCode())
                     .projectNo(record.getProjectNo())
                     .productionDepartment(record.getProductionDepartment())
@@ -199,8 +203,10 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                 throw new RuntimeException(e);
             }
         }));
+        BigDecimal exchangeRate = systemSettingService.getExchangeRate();
         List<BusinessProfitDetailVO> innerProfitRatioResultVOs = records.stream().map(record -> {
             BusinessProfitDetailVO vo = BusinessProfitDetailVO.builder()
+                    .orderId(record.getId())
                     .customerCode(record.getCustomerCode())
                     .projectNo(record.getProjectNo())
                     .productionDepartment(record.getProductionDepartment())
@@ -214,13 +220,13 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                     .build();
             if (Objects.nonNull(vo.getPacketTotalPrice())) {
                 //包装费用合计 = 包装费合计*汇率
-                vo.setPacketRmbTotalPrice(BigDecimal.valueOf(vo.getPacketTotalPrice()).multiply((new BigDecimal("6.2")).setScale(4, RoundingMode.HALF_UP)).doubleValue());
+                vo.setPacketRmbTotalPrice(BigDecimal.valueOf(vo.getPacketTotalPrice()).multiply(exchangeRate.setScale(4, RoundingMode.HALF_UP)).doubleValue());
             }
             if (Objects.nonNull(vo.getPacketActualRmbTotalPrice()) && Objects.nonNull(vo.getOrderCount())) {
                 //实际跟单单价 = 包装费用实际金额/数量
                 vo.setPacketActualRmbPrice(vo.getPacketActualRmbTotalPrice().divide(BigDecimal.valueOf(vo.getOrderCount()), 4, RoundingMode.HALF_UP));
                 //实际跟单单价折算美金$ = 人民币单价/汇率
-                vo.setPacketActualPrice(vo.getPacketActualRmbPrice().divide(new BigDecimal("6.2"), 4, RoundingMode.HALF_UP));
+                vo.setPacketActualPrice(vo.getPacketActualRmbPrice().divide(exchangeRate, 4, RoundingMode.HALF_UP));
             }
             if (Objects.nonNull(vo.getPacketRmbTotalPrice()) && Objects.nonNull(vo.getPacketActualRmbPrice())) {
                 //包装费用收益￥ = 包装费用合计-包装费用实际金额
@@ -443,7 +443,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                         throw new RuntimeException(e);
                     }
                 }));
-
+        BigDecimal exchangeRate = systemSettingService.getExchangeRate();
         List<BusinessProfitInfoVO> businessProfitInfoVOs = orderBaseInfoDOSGroupByProjectNoPre.entrySet().stream().map(entry -> {
             List<OrderInfoResultVO> details = entry.getValue();
             BusinessProfitInfoVO businessProfitInfoVO = BusinessProfitInfoVO.builder()
@@ -494,7 +494,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
             //包装费用合计￥
             businessProfitInfoVO.setPacketRmbTotalPrice(Optional.ofNullable(businessProfitInfoVO.getPacketTotalPrice())
-                    .orElse(0.0) * 6.2);
+                    .orElse(0.0) *exchangeRate.doubleValue());
             //包装费用实际金额
             details.stream()
                     .map(OrderInfoResultVO::getOrderCostInfo)
@@ -517,7 +517,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                 //实际跟单单价
                 businessProfitInfoVO.setActualOrderRmbPrice(businessProfitInfoVO.getPacketActualRmbTotalPrice().divide(new BigDecimal(businessProfitInfoVO.getOrderCount()), 4, RoundingMode.HALF_UP));
                 //折换成美金
-                businessProfitInfoVO.setActualOrderPrice(businessProfitInfoVO.getActualOrderRmbPrice().divide(BigDecimal.valueOf(6.2), 4, RoundingMode.HALF_UP));
+                businessProfitInfoVO.setActualOrderPrice(businessProfitInfoVO.getActualOrderRmbPrice().divide(exchangeRate, 4, RoundingMode.HALF_UP));
             }
             if (Objects.nonNull(businessProfitInfoVO.getPacketActualRmbTotalPrice())
                     && Objects.nonNull(businessProfitInfoVO.getPacketRmbTotalPrice())) {