fix: 订单编辑

谢茂盛
1 parent f07c2523
Showing 2 changed files with 12 additions and 4 deletions
src/main/java/com/order/erp/domain/OrderOptTypeEnum.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
@@ -17,7 +17,7 @@ public enum OrderOptTypeEnum {
     ORDER_CREATE(0, "订单创建"),
-    ORDER_EDIT(10, "订单编辑"),
+    ORDER_EDIT(10, "订单基础信息编辑"),
     ORDER_FIELD_UNLOCK_APPLY(20, "订单字段解锁申请"),
@@ -25,6 +25,10 @@ public enum OrderOptTypeEnum {
     ORDER_REPORT_EDIT_APPLY(40, "项目报告书编辑申请"),
+    ORDER_TRACKER_EDIT_APPLY(50, "跟单信息编辑"),
+
+    ORDER_INSPECT_EDIT_APPLY(60, "质检信息编辑"),
+
     ;
     private Integer type;
@@ -1172,9 +1172,11 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         if (Objects.isNull(orderBaseInfoDo)) {
             throw new BusinessException(ServerResultCode.ORDER_BASE_INFO_EMPTY);
         }
+        OrderOptLogDO optLogDO = new OrderOptLogDO();
         if (Objects.nonNull(updateVO.getBaseInfo())) {
             buildUpdateVO(updateVO.getBaseInfo(), orderBaseInfoDo);
             orderBaseInfoDo.setId(updateVO.getOrderId());
+            optLogDO = buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_EDIT.getDesc(), JSONObject.toJSONString(updateVO));
         }
         if (Objects.nonNull(updateVO.getProfitAnalysisInfo())) {
             checkApply(updateVO.getOrderId(), userId);
@@ -1182,7 +1184,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             orderFieldLockApplyService.save(orderFieldLockApplyDO);
             orderBaseInfoDo.setOrderStatus(OrderStatusEnum.PROFIT_WAIT_AUDIT.getStatus());
-            orderOptLogService.save(buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_PROFIT_EDIT_APPLY.getDesc(), orderFieldLockApplyDO.getFields()));
+            optLogDO = buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_PROFIT_EDIT_APPLY.getDesc(), orderFieldLockApplyDO.getFields());
         }
         if (Objects.nonNull(updateVO.getReportInfo())) {
@@ -1191,7 +1193,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             orderFieldLockApplyService.save(orderFieldLockApplyDO);
             orderBaseInfoDo.setOrderStatus(OrderStatusEnum.REPORT_WAIT_AUDIT.getStatus());
-            orderOptLogService.save(buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_REPORT_EDIT_APPLY.getDesc(), orderFieldLockApplyDO.getFields()));
+            optLogDO = buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_REPORT_EDIT_APPLY.getDesc(), orderFieldLockApplyDO.getFields());
         }
         if (Objects.nonNull(updateVO.getTrackStageInfo())) {
@@ -1250,6 +1252,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 trackStageService.save(trackStageDO);
             }
             orderBaseInfoDo.setOrderStatus(OrderStatusEnum.TRACK_ING.getStatus());
+            optLogDO = buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_TRACKER_EDIT_APPLY.getDesc(), JSONObject.toJSONString(updateVO));
         }
         if (Objects.nonNull(updateVO.getInspectionStageInfo())) {
@@ -1305,9 +1308,10 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 inspectionStageService.save(inspectionStageDO);
             }
             orderBaseInfoDo.setOrderStatus(OrderStatusEnum.INSPECT_ING.getStatus());
+            optLogDO = buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_INSPECT_EDIT_APPLY.getDesc(), JSONObject.toJSONString(updateVO));
         }
         updateById(orderBaseInfoDo);
-        orderOptLogService.save(buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_EDIT.getDesc(), JSONObject.toJSONString(updateVO)));
+        orderOptLogService.save(optLogDO);
         return ServerResult.success();
     }