feat(order): 新增订单和项目基础信息锁定功能

- 在 OrderCostInfoServiceImpl 和 ProjectBaseInfoServiceImpl 中添加字段锁定逻辑 - 在 OrderBaseInfoVO 和 ProjectBaseInfoVO 中添加 createTime 字段 - 更新 application-test.yml 中的 Redis配置 - 新增 ProjectFieldEditType 枚举类

feat(order): 新增订单和项目基础信息锁定功能
- 在 OrderCostInfoServiceImpl 和 ProjectBaseInfoServiceImpl 中添加字段锁定逻辑 - 在 OrderBaseInfoVO 和 ProjectBaseInfoVO 中添加 createTime 字段 - 更新 application-test.yml 中的 Redis配置 - 新增 ProjectFieldEditType 枚举类
曾国涛
1 parent 32e5b9d5
Showing 6 changed files with 136 additions and 35 deletions
src/main/java/com/order/erp/domain/ProjectFieldEditType.java
src/main/java/com/order/erp/domain/vo/order/OrderBaseInfoVO.java
src/main/java/com/order/erp/domain/vo/order/ProjectBaseInfoVO.java
src/main/java/com/order/erp/service/order/impl/OrderCostInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/ProjectBaseInfoServiceImpl.java
src/main/resources/application-test.yml
+package com.order.erp.domain;
+
+import com.order.erp.domain.vo.order.BusinessProfitInfoVO;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author zgt
+ * @project order-erp
+ * @description
+ * @date 2025/3/27
+ */
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public enum ProjectFieldEditType {
+    InnerProfitInfo("内部表编辑"),
+    BusinessProfitInfo("业务利润表编辑");
+    private String Text;
+}
@@ -4,6 +4,7 @@ import lombok.*;
 import lombok.experimental.SuperBuilder;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 /**
  * 订单基础信息表(OrderBaseInfo)实体类
@@ -26,6 +27,8 @@ public class OrderBaseInfoVO implements Serializable {
      */
     private String invoiceNo;
+    private LocalDateTime createTime;
+
     /**
      * 生产科对账单号  如果要在首页添加生产科对账单号列数,就需要在这里加上。
      */
@@ -50,5 +50,7 @@ public class ProjectBaseInfoVO implements Serializable {
     private BigDecimal actualExchangeRate;
+    private String fieldType;
+
 }
@@ -34,6 +34,7 @@ import com.order.erp.service.order.OrderFieldLockRecordService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -65,6 +66,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
     private SystemSettingService systemSettingService;
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ServerResult edit(OrderCostInfoVO vo) {
         Long id = vo.getOrderId();
         Optional<OrderCostInfoDO> orderCostInfoDOOpt = this.lambdaQuery()
@@ -78,6 +80,26 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
             orderCostInfoDO = orderCostInfoDOOpt.get();
             BeanUtil.copyProperties(vo, orderCostInfoDO, CopyOptions.create().ignoreNullValue());
         }
+        Optional<OrderCostFieldLockRecord> orderCostFieldLockRecordOpt = orderCostFieldLockRecordService
+                .lambdaQuery()
+                .eq(OrderCostFieldLockRecord::getOrderId, id)
+                .last(" limit 1 ")
+                .oneOpt();
+        OrderCostFieldLockRecord orderCostFieldLockRecord = orderCostFieldLockRecordOpt.orElse(
+                OrderCostFieldLockRecord.builder()
+                        .orderId(id)
+                        .userId(dataScope.getLoginUserId())
+                        .build()
+        );
+        OrderCostInfolockFieldVO originOrderCostInfolockFieldVO = JSONObject.parseObject(Optional.ofNullable(orderCostFieldLockRecord.getFields()).orElse("{}"), OrderCostInfolockFieldVO.class);
+        if(Objects.nonNull(vo.getPacketActualRmbTotalPrice())){
+            originOrderCostInfolockFieldVO.setPacketActualRmbTotalPrice(OrderLockFieldEnum.LOCKED.name());
+        }else if(Objects.nonNull(vo.getProductionActualPrice())||Objects.nonNull(vo.getProductionDepartmentPredictPrice())) {
+            originOrderCostInfolockFieldVO.setProductionActualPrice(OrderLockFieldEnum.LOCKED.name());
+            originOrderCostInfolockFieldVO.setProductionDepartmentPredictPrice(OrderLockFieldEnum.LOCKED.name());
+        }
+        orderCostFieldLockRecord.setFields(JSONObject.toJSONString(originOrderCostInfolockFieldVO));
+        orderCostFieldLockRecordService.saveOrUpdate(orderCostFieldLockRecord);
         return ServerResult.success(this.saveOrUpdate(orderCostInfoDO));
     }
@@ -137,6 +159,18 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
         }));
         List<InnerProfitDetailVO> innerProfitRatioResultVOs = records.stream().map(record -> {
             OrderCostInfoVO orderCostInfo = record.getOrderCostInfo();
+            OrderCostInfolockFieldVO lockFields = Optional.ofNullable(orderId2fieldMapMap.get(record.getId()))
+                    .orElse(new OrderCostInfolockFieldVO()
+                    );
+            if(Objects.isNull(lockFields.getPacketActualRmbTotalPrice())){
+                lockFields.setPacketActualRmbTotalPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getPacketActualRmbTotalPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+            }
+            if(Objects.isNull(lockFields.getProductionActualPrice())){
+                lockFields.setProductionActualPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getProductionActualPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+            }
+            if(Objects.isNull(lockFields.getProductionDepartmentPredictPrice())){
+                lockFields.setProductionDepartmentPredictPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getProductionDepartmentPredictPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+            }
             InnerProfitDetailVO vo = InnerProfitDetailVO.builder()
                     .orderId(record.getId())
                     .customerCode(record.getCustomerCode())
@@ -149,14 +183,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                     .productionDepartmentTotalPrice(Objects.isNull(record.getProfitAnalysisInfo()) ? null : record.getProfitAnalysisInfo().getProductionDepartmentTotalPrice())
                     .productionDepartmentPredictPrice(Objects.isNull(record.getOrderCostInfo()) ? null : record.getOrderCostInfo().getProductionDepartmentPredictPrice())
                     .productionActualPrice(Objects.isNull(record.getOrderCostInfo()) ? null : record.getOrderCostInfo().getProductionActualPrice())
-                    .lockFields(Optional.ofNullable(orderId2fieldMapMap.get(record.getId()))
-                            .orElse(OrderCostInfolockFieldVO
-                                    .builder()
-                                    .packetActualRmbTotalPrice(Objects.isNull(orderCostInfo)||Objects.isNull(orderCostInfo.getPacketActualRmbTotalPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
-                                    .productionActualPrice(Objects.isNull(orderCostInfo)||Objects.isNull(orderCostInfo.getProductionActualPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
-                                    .productionDepartmentPredictPrice(Objects.isNull(orderCostInfo)||Objects.isNull(orderCostInfo.getProductionDepartmentPredictPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
-                                    .build()
-                            ))
+                    .lockFields(lockFields)
                     .build();
             if (Objects.nonNull(vo.getProductionDepartmentPredictPrice())
@@ -222,8 +249,21 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
             }
         }));
         BigDecimal exchangeRate = systemSettingService.getExchangeRate();
+
         List<BusinessProfitDetailVO> innerProfitRatioResultVOs = records.stream().map(record -> {
             OrderCostInfoVO orderCostInfo = record.getOrderCostInfo();
+            OrderCostInfolockFieldVO lockFields = Optional.ofNullable(orderId2fieldMapMap.get(record.getId())).orElse(
+                    new OrderCostInfolockFieldVO()
+            );
+            if(Objects.isNull(lockFields.getPacketActualRmbTotalPrice())){
+                lockFields.setPacketActualRmbTotalPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getPacketActualRmbTotalPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+            }
+            if(Objects.isNull(lockFields.getProductionActualPrice())){
+                lockFields.setProductionActualPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getProductionActualPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+            }
+            if(Objects.isNull(lockFields.getProductionDepartmentPredictPrice())){
+                lockFields.setProductionDepartmentPredictPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getProductionDepartmentPredictPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+            }
             BusinessProfitDetailVO vo = BusinessProfitDetailVO.builder()
                     .orderId(record.getId())
                     .customerCode(record.getCustomerCode())
@@ -235,12 +275,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                     .packetPrice(Objects.isNull(record.getProfitAnalysisInfo()) ? null : record.getProfitAnalysisInfo().getPacketPrice())
                     .packetTotalPrice(Objects.isNull(record.getProfitAnalysisInfo()) ? null : record.getProfitAnalysisInfo().getPacketTotalPrice())
                     .packetActualRmbTotalPrice(Objects.isNull(record.getOrderCostInfo()) ? null : record.getOrderCostInfo().getPacketActualRmbTotalPrice())
-                    .lockFields(Optional.ofNullable(orderId2fieldMapMap.get(record.getId())).orElse(OrderCostInfolockFieldVO.builder()
-                            .packetActualRmbTotalPrice(Objects.isNull(orderCostInfo)||Objects.isNull(orderCostInfo.getPacketActualRmbTotalPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
-                            .productionActualPrice(Objects.isNull(orderCostInfo)||Objects.isNull(orderCostInfo.getProductionActualPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
-                            .productionDepartmentPredictPrice(Objects.isNull(orderCostInfo)||Objects.isNull(orderCostInfo.getProductionDepartmentPredictPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
-                            .build()
-                    ))
+                    .lockFields(lockFields)
                     .build();
             if (Objects.nonNull(vo.getPacketTotalPrice())) {
                 //包装费用合计 = 包装费合计*汇率
@@ -18,6 +18,7 @@ import com.order.erp.config.DataScope;
 import com.order.erp.domain.ApplyStatusEnum;
 import com.order.erp.domain.OrderLockFieldEnum;
 import com.order.erp.domain.ProjectApplyTypeEnum;
+import com.order.erp.domain.ProjectFieldEditType;
 import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.SystemSettingDO;
 import com.order.erp.domain.dto.order.OrderBaseInfoDO;
@@ -91,6 +92,41 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         } else {
             projectBaseInfoDO = BeanUtil.copyProperties(vo, ProjectBaseInfoDO.class);
         }
+        ProjectFieldLockRecord recordDO = projectionFieldLockRecordService.getOne(new LambdaQueryWrapper<ProjectFieldLockRecord>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(ProjectFieldLockRecord::getProjectNoPrefix, projectNoPrefix)
+                .eq(ProjectFieldLockRecord::getUserId, dataScope.getLoginUserId())
+                .orderByDesc(ProjectFieldLockRecord::getId)
+                .last("limit 1"));
+        if (Objects.isNull(recordDO)) {
+            recordDO = ProjectFieldLockRecord.builder()
+                    .projectNoPrefix(projectNoPrefix)
+                    .userId(dataScope.getLoginUserId())
+                    .build();
+        }
+        ProjectBaseInfoLockFieldVO recordLockFieldVO = JSONObject.parseObject(Optional.ofNullable(recordDO.getFields()).orElse("{}"), ProjectBaseInfoLockFieldVO.class);
+        if (Objects.nonNull(vo.getProjectStartTime())||
+                Objects.nonNull(vo.getProjectEndTime())||
+                Objects.nonNull(vo.getDevelopmentCopyRmbTotalPrice())||
+                Objects.nonNull(vo.getSpainPaidRmbCommission())||
+                Objects.nonNull(vo.getPaidRmbCommission())||
+                Objects.nonNull(vo.getActualExchangeRate())) {
+            recordLockFieldVO.setProjectStartTime("LOCKED");
+            recordLockFieldVO.setProjectEndTime("LOCKED");
+            recordLockFieldVO.setDevelopmentCopyRmbTotalPrice("LOCKED");
+            recordLockFieldVO.setSpainPaidRmbCommission("LOCKED");
+            recordLockFieldVO.setPaidRmbCommission("LOCKED");
+            recordLockFieldVO.setActualExchangeRate("LOCKED");
+        } else if (Objects.nonNull(vo.getProjectInnerProfitInfoStartTime()) || Objects.nonNull(vo.getProjectInnerProfitInfoEndTime())) {
+            recordLockFieldVO.setProjectInnerProfitInfoStartTime("LOCKED");
+            recordLockFieldVO.setProjectInnerProfitInfoEndTime("LOCKED");
+        }
+        recordDO.setFields(JSONObject.toJSONString(recordLockFieldVO));
+        if (Objects.isNull(recordDO.getId())) {
+            projectionFieldLockRecordService.save(recordDO);
+        } else {
+            projectionFieldLockRecordService.updateById(recordDO);
+        }
         return ServerResult.success(this.saveOrUpdate(projectBaseInfoDO));
     }
@@ -98,7 +134,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
     public ServerResult applyEditFileds(ProjectBaseInfoLockFieldVO vo) {
         List<ProjectApplyDO> applyDOS = projectFieldLockApplyService.list(new LambdaQueryWrapper<ProjectApplyDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .eq(ProjectApplyDO::getType,vo.getType())
+                .eq(ProjectApplyDO::getType, vo.getType())
                 .eq(ProjectApplyDO::getProjectNoPrefix, vo.getProjectNoPrefix())
                 .eq(ProjectApplyDO::getApplyUserId, dataScope.getLoginUserId())
                 .eq(ProjectApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus()));
@@ -132,7 +168,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
     public ServerResult pageProjectLockFieldApply(QueryProjectLockFieldVO vo) {
         Page<ProjectApplyDO> page = projectFieldLockApplyService.lambdaQuery()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .eq(Objects.nonNull(vo.getType()),ProjectApplyDO::getType, vo.getType())
+                .eq(Objects.nonNull(vo.getType()), ProjectApplyDO::getType, vo.getType())
                 .eq(ProjectApplyDO::getStatus, StringUtils.isBlank(vo.getStatus()) ? ApplyStatusEnum.WAIT_AUDIT.getStatus() : vo.getStatus())
                 .orderByDesc(ProjectApplyDO::getCreateTime)
                 .page(new Page<>(vo.getPage(), vo.getPageSize()));
@@ -168,11 +204,11 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
             }
             ProjectBaseInfoLockFieldVO applyLockFieldVO = JSONObject.parseObject(applyDO.getFields(), ProjectBaseInfoLockFieldVO.class);
             ProjectBaseInfoLockFieldVO recordLockFieldVO = JSONObject.parseObject(Optional.ofNullable(recordDO.getFields()).orElse("{}"), ProjectBaseInfoLockFieldVO.class);
-            if(ProjectApplyTypeEnum.FIELD_EDIT_APPLY.name().equals(applyDO.getType())){
+            if (ProjectApplyTypeEnum.FIELD_EDIT_APPLY.name().equals(applyDO.getType())) {
                 ProjectBaseInfoLockFieldVO projectBaseInfoLockFieldVO = Optional.ofNullable(recordLockFieldVO).orElse(new ProjectBaseInfoLockFieldVO());
-                BeanUtil.copyProperties(applyLockFieldVO, projectBaseInfoLockFieldVO, CopyOptions.create().setIgnoreProperties("projectInnerProfitInfoStartTime","projectInnerProfitInfoEndTime").ignoreNullValue());
+                BeanUtil.copyProperties(applyLockFieldVO, projectBaseInfoLockFieldVO, CopyOptions.create().setIgnoreProperties("projectInnerProfitInfoStartTime", "projectInnerProfitInfoEndTime").ignoreNullValue());
                 recordLockFieldVO = projectBaseInfoLockFieldVO;
-            }else if(ProjectApplyTypeEnum.INNER_PROFIT_FIELD_EDIT_APPLY.name().equals(applyDO.getType())){
+            } else if (ProjectApplyTypeEnum.INNER_PROFIT_FIELD_EDIT_APPLY.name().equals(applyDO.getType())) {
                 recordLockFieldVO.setProjectInnerProfitInfoStartTime(applyLockFieldVO.getProjectInnerProfitInfoStartTime());
                 recordLockFieldVO.setProjectInnerProfitInfoEndTime(applyLockFieldVO.getProjectInnerProfitInfoEndTime());
             }
@@ -245,7 +281,6 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
     }
-
     /**
      * 查询订单列表
      */
@@ -356,15 +391,19 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         return orderBaseInfoDOSGroupByProjectNoPre.entrySet().stream().map(entry -> {
             ProjectBaseInfoDO projectBaseInfoDO = no2ProjectInfoMap.get(entry.getKey());
             List<OrderInfoResultVO> details = entry.getValue();
+            ProjectBaseInfoLockFieldVO lockFields = Optional.ofNullable(prjectNo2LockRecordMap.get(entry.getKey())).orElse(
+                    new ProjectBaseInfoLockFieldVO());
+            if(Objects.isNull(lockFields.getProjectInnerProfitInfoStartTime())){
+                lockFields.setProjectInnerProfitInfoStartTime(Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getProjectInnerProfitInfoStartTime()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+            }
+            if(Objects.isNull(lockFields.getProjectInnerProfitInfoEndTime())){
+                lockFields.setProjectInnerProfitInfoEndTime(Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getProjectInnerProfitInfoEndTime()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+            }
             InnerProfitInfoVO innerProfitInfoVO = InnerProfitInfoVO.builder()
                     .customerCode(details.get(0).getCustomerCode())
                     .projectNoPrefix(entry.getKey())
                     .productionDepartment(details.get(0).getProductionDepartment())
-                    .lockFields(Optional.ofNullable(prjectNo2LockRecordMap.get(entry.getKey())).orElse(
-                            ProjectBaseInfoLockFieldVO.builder()
-                            .projectInnerProfitInfoStartTime(Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getProjectInnerProfitInfoStartTime()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
-                            .projectInnerProfitInfoEndTime(Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getProjectInnerProfitInfoEndTime()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
-                            .build()))
+                    .lockFields(lockFields)
                     .build();
             //数量
@@ -445,7 +484,8 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
             //hod时间差
             LocalDateTime earliest = Optional.ofNullable(no2ProjectInfoMap.get(entry.getKey())).map(ProjectBaseInfoDO::getProjectInnerProfitInfoStartTime).orElse(null);
-            LocalDateTime latest = Optional.ofNullable(no2ProjectInfoMap.get(entry.getKey())).map(ProjectBaseInfoDO::getProjectInnerProfitInfoEndTime).orElse(null);;
+            LocalDateTime latest = Optional.ofNullable(no2ProjectInfoMap.get(entry.getKey())).map(ProjectBaseInfoDO::getProjectInnerProfitInfoEndTime).orElse(null);
+            ;
             innerProfitInfoVO.setProduceStartTime(earliest);
             innerProfitInfoVO.setProduceEndTime(latest);
             SystemSettingDO systemSettingDO = systemSettingDOSMap.get(innerProfitInfoVO.getCustomerCode());
@@ -470,16 +510,17 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                             && Objects.nonNull(latest)) {
                         Duration duration = Duration.between(earliest, latest);
                         //内部生产固定成本￥
-                        innerProfitInfoVO.setInnerProductionFixedCost(BigDecimal.valueOf((duration.toDays()+1) * Double.parseDouble(fixCostValue)));
+                        innerProfitInfoVO.setInnerProductionFixedCost(BigDecimal.valueOf((duration.toDays() + 1) * Double.parseDouble(fixCostValue)));
                     }
                     if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(ratioValue)
                             && Objects.nonNull(innerProfitInfoVO.getPredictRatio())
                             && innerProfitInfoVO.getPredictRatio().compareTo(BigDecimal.valueOf(1.05)) < 0) {
                         //内部生产提成￥
+                        String finalRatioValue = ratioValue;
                         innerProfitInfoVO.setInnerProductionCommission(
                                 details.stream()
                                         .map(detail -> BigDecimal.valueOf(detail.getOrderCount())
-                                                .multiply(BigDecimal.valueOf(Optional.ofNullable(detail.getProfitAnalysisInfo()).map(OrderProfitAnalysisVO::getCustomerRmbPrice).orElse(0.0))))
+                                                .multiply(BigDecimal.valueOf(Optional.ofNullable(finalRatioValue).map(Double::valueOf).orElse(0.0))))
                                         .reduce(BigDecimal.ZERO, BigDecimal::add)
                         );
                     }
@@ -657,8 +698,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
             //hod时间差
             LocalDateTime earliest = details.stream()
-                    .map(OrderInfoResultVO::getOrderHodTime)
-                    .map(hodTime -> LocalDateTime.parse(hodTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
+                    .map(OrderInfoResultVO::getCreateTime)
                     .min(Comparator.naturalOrder())
                     .orElse(null);
             LocalDateTime latest = details.stream()
@@ -710,7 +750,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                         }
                     }
                     //固定成本
-                    businessProfitInfoVO.setFixedCost(BigDecimal.valueOf((between+1) * Double.parseDouble(fixCostValue)).setScale(2, RoundingMode.HALF_UP));
+                    businessProfitInfoVO.setFixedCost(BigDecimal.valueOf((between + 1) * Double.parseDouble(fixCostValue)).setScale(2, RoundingMode.HALF_UP));
                     if (Objects.nonNull(spainRatio)
                             && Objects.nonNull(businessProfitInfoVO.getCustomerRmbTotalPrice())) {
                         //西班牙提成
@@ -944,7 +984,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         String projectStartTime = Optional.ofNullable(vo.getProduceStartTime()).map(dateTimeFormatter::format).orElse("-");
         String projectEndTime = Optional.ofNullable(vo.getProduceEndTime()).map(dateTimeFormatter::format).orElse("-");
         String duration = (vo.getProduceStartTime() != null && vo.getProduceEndTime() != null)
-                ? String.valueOf(Duration.between(vo.getProduceStartTime(), vo.getProduceEndTime()).toDays()+1)
+                ? String.valueOf(Duration.between(vo.getProduceStartTime(), vo.getProduceEndTime()).toDays() + 1)
                 : "-";
         createMergedRow(sheet, cellStyle, 6, 7, 0, 1, "");
         createMergedRow(sheet, cellStyle, 6, 7, 2, 3, "生产起止时间");
@@ -978,7 +1018,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         // 第六部分：毛利润
         createMergedRow(sheet, cellStyle, 16, 17, 0, 3, "内部生产毛利润");
-        createMergedRow(sheet, cellStyle, 16, 17, 4, 5, "￥" + Optional.ofNullable(vo.getBeforeGrossProfit()).orElse(BigDecimal.ZERO));
+        createMergedRow(sheet, cellStyle, 16, 17, 4, 5, "￥" + Optional.ofNullable(vo.getGrossProfit()).orElse(BigDecimal.ZERO));
         createMergedRow(sheet, cellStyle, 16, 16, 6, 7, "事前毛利润");
         createMergedRow(sheet, cellStyle, 16, 16, 8, 9, "事前毛利率");
         createMergedRow(sheet, cellStyle, 17, 17, 6, 7, Optional.ofNullable(vo.getBeforeGrossProfit()).orElse(BigDecimal.ZERO).toString());
@@ -63,7 +63,7 @@ spring:
     username: root
   redis:
     database: 0
-    host: 47.104.8.35
+    host: 39.108.227.113
     lettuce:
       pool:
         max-active: 2000
@@ -72,7 +72,7 @@ spring:
         min-idle: 3
         time-between-eviction-runs: 100
     password: ''
-    port: 6380
+    port: 6379
     timeout: 2000
   mail:
     # 配置 SMTP 服务器地址