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

qdlgxiemaosheng
1 parent 52699880
Showing 2 changed files with 23 additions and 1 deletions
src/main/java/com/order/erp/common/utils/OrderFieldUtils.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
@@ -86,6 +86,8 @@ public class OrderFieldUtils {
         String locked = lockFieldEnum.getStatus();
         return OrderProfitAnalysisFieldVO.builder()
                 .customerPrice(locked)
+                .customerRmbPrice(locked)
+                .customerRmbTotalPrice(locked)
                 .customerTotalPrice(locked)
                 .customerCurrency(locked)
                 .exchangeRate(locked)
@@ -827,7 +827,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         if (StringUtils.isBlank(inspectionStageInfo.getEndCheckResult())) {
             return false;
-        } else if ("FAIL" .equals(inspectionStageInfo.getEndCheckResult())) {
+        } else if ("FAIL".equals(inspectionStageInfo.getEndCheckResult())) {
             return false;
         }
         return true;
@@ -1369,6 +1369,24 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     }
     /**
+     * @param orderId
+     * @param userId
+     * @return
+     */
+    public OrderFieldLockRecordDO lockProfitField(Long orderId, Long userId) {
+        return OrderFieldLockRecordDO.builder().orderId(orderId).userId(userId).fields(JSONObject.toJSONString(OrderFieldUtils.initProfitAnalysisField(OrderLockFieldEnum.LOCKED))).build();
+    }
+
+    /**
+     * @param orderId
+     * @param userId
+     * @return
+     */
+    public OrderFieldLockRecordDO lockReportField(Long orderId, Long userId) {
+        return OrderFieldLockRecordDO.builder().orderId(orderId).userId(userId).fields(JSONObject.toJSONString(OrderFieldUtils.initReportField(OrderLockFieldEnum.LOCKED))).build();
+    }
+
+    /**
      * @param profitAnalysisVO
      * @param orderBaseInfoDo
      * @param userId
@@ -1430,6 +1448,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             orderBaseInfoDo.setOrderStatus(ApplyStatusEnum.AUDIT_PASS.getStatus().equals(orderFieldLockApplyDO.getStatus()) ? OrderStatusEnum.PROFIT_AUDIT_PASS.getStatus()
                     : OrderStatusEnum.PROFIT_WAIT_AUDIT.getStatus());
             optLogDO = buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_PROFIT_EDIT_APPLY.getDesc(), orderFieldLockApplyDO.getFields());
+            fieldLockRecordService.save(lockProfitField(updateVO.getOrderId(), userId));
         }
         if (Objects.nonNull(updateVO.getReportInfo())) {
@@ -1439,6 +1458,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             orderBaseInfoDo.setOrderStatus(OrderStatusEnum.REPORT_WAIT_AUDIT.getStatus());
             optLogDO = buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_REPORT_EDIT_APPLY.getDesc(), orderFieldLockApplyDO.getFields());
+            fieldLockRecordService.save(lockReportField(updateVO.getOrderId(), userId));
         }
         if (Objects.nonNull(updateVO.getTrackStageInfo())) {