修改代码

Ran
1 parent 663fba6e
Showing 2 changed files with 7 additions and 1 deletions
src/main/java/com/order/erp/domain/vo/order/OrderProfitAnalysisVO.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
 package com.order.erp.domain.vo.order;
  
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
  
@@ -96,5 +97,10 @@ public class OrderProfitAnalysisVO implements Serializable {
      */
     private String profitType;
  
+    /**
+     * 是否修改包装费用，修改了为true，没有修改为false
+     */
+    private Boolean isEditPacketPrice;
+
  
 }
@@ -1491,7 +1491,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         OrderFieldLockApplyDO orderFieldLockApplyDO = buildProfitFieldLockApplyDO(profitAnalysisFieldVO, userId);
         orderFieldLockApplyService.save(orderFieldLockApplyDO);
  
-        if (Double.parseDouble(profitAnalysisFieldVO.getProfitRate()) >= profitRate) {
+        if (Double.parseDouble(profitAnalysisFieldVO.getProfitRate()) >= profitRate && !profitAnalysisVO.getIsEditPacketPrice()) {
             // 直接通过
             orderFieldLockApplyService.doAudit(AuditVO.builder()
                     .id(orderFieldLockApplyDO.getId())