fix: 记录日志

谢茂盛
1 parent afa4f88d
Showing 2 changed files with 56 additions and 5 deletions
src/main/java/com/order/erp/domain/OrderOptTypeEnum.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
+package com.order.erp.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author: xms
+ * @description: TODO
+ * @date: 2023/9/13 18:05
+ * @version: 1.0
+ */
+@Getter
+@AllArgsConstructor
+public enum OrderOptTypeEnum {
+
+    ORDER_DELETE(-10, "订单删除"),
+
+    ORDER_CREATE(0, "订单创建"),
+
+    ORDER_EDIT(10, "订单编辑"),
+
+    ORDER_FIELD_UNLOCK_APPLY(20, "订单字段解锁申请"),
+
+    ORDER_PROFIT_EDIT_APPLY(30, "利润分析编辑申请"),
+
+    ORDER_REPORT_EDIT_APPLY(40, "项目报告书编辑申请"),
+
+    ;
+    private Integer type;
+
+    private String desc;
+}
@@ -20,10 +20,7 @@ import com.order.erp.common.utils.FileUtil;
 import com.order.erp.common.utils.OrderFieldUtils;
 import com.order.erp.common.utils.ProfitUtils;
 import com.order.erp.config.DataScope;
-import com.order.erp.domain.ApplyStatusEnum;
-import com.order.erp.domain.ApplyTypeEnum;
-import com.order.erp.domain.OrderLockFieldEnum;
-import com.order.erp.domain.OrderStatusEnum;
+import com.order.erp.domain.*;
 import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.order.*;
 import com.order.erp.domain.excel.OrderExcelVO;
@@ -222,6 +219,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         OrderFieldLockApplyDO applyDO = initOrderFieldLockApplyDO(fieldVO, userId);
  
         orderFieldLockApplyService.save(applyDO);
+        orderOptLogService.save(buildOrderOptLogDo(fieldVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_FIELD_UNLOCK_APPLY.getDesc(), applyDO.getFields()));
         return ServerResult.success();
     }
  
@@ -536,6 +534,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         if (Objects.isNull(baseInfoVO)) {
             throw new BusinessException(ServerResultCode.ORDER_BASE_INFO_EMPTY);
         }
+        Long userId = dataScope.getLoginUserId();
         OrderBaseInfoDO baseInfoDO = new OrderBaseInfoDO();
         BeanUtils.copyProperties(baseInfoVO, baseInfoDO);
         baseInfoDO.setOrderStatus(OrderStatusEnum.CREATE_FINISH.getStatus());
@@ -582,10 +581,23 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             inspectionStageService.save(inspectionStageDO);
         }
  
+        orderOptLogService.save(buildOrderOptLogDo(baseInfoDO.getId(), userId, OrderOptTypeEnum.ORDER_CREATE.getDesc(), null));
+
         return ServerResult.success();
     }
  
     /**
+     * @param orderId
+     * @param userId
+     * @param optType
+     * @param jsonString
+     * @return
+     */
+    private OrderOptLogDO buildOrderOptLogDo(Long orderId, Long userId, String optType, String jsonString) {
+        return OrderOptLogDO.builder().orderId(orderId).userId(userId).fields(jsonString).optType(optType).build();
+    }
+
+    /**
      * 修改数据
      *
      * @param updateVO 实例对象
@@ -615,6 +627,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
  
             orderBaseInfoDo.setOrderStatus(OrderStatusEnum.PROFIT_WAIT_AUDIT.getStatus());
             updateById(orderBaseInfoDo);
+            orderOptLogService.save(buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_PROFIT_EDIT_APPLY.getDesc(), orderFieldLockApplyDO.getFields()));
         }
  
         if (Objects.nonNull(updateVO.getReportInfo())) {
@@ -624,6 +637,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
  
             orderBaseInfoDo.setOrderStatus(OrderStatusEnum.REPORT_WAIT_AUDIT.getStatus());
             updateById(orderBaseInfoDo);
+            orderOptLogService.save(buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_REPORT_EDIT_APPLY.getDesc(), orderFieldLockApplyDO.getFields()));
         }
  
         if (Objects.nonNull(updateVO.getTrackStageInfo())) {
@@ -664,6 +678,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             updateById(orderBaseInfoDo);
         }
  
+        orderOptLogService.save(buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_EDIT.getDesc(), JSONObject.toJSONString(updateVO)));
         return ServerResult.success();
     }
  
@@ -680,6 +695,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         if (CollUtil.isEmpty(ids)) {
             return ServerResult.fail("ids 参数不能为空");
         }
+        Long userId = dataScope.getLoginUserId();
         List<OrderBaseInfoDO> orderBaseInfoList = listByIds(ids);
         if (CollUtil.isEmpty(orderBaseInfoList)) {
             return ServerResult.success();
@@ -717,7 +733,10 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         //订单-跟单环节
         trackStageService.deleteByOrderIds(ids);
  
-
+        List<OrderOptLogDO> orderOptLogDOS = ids.stream().map(x -> {
+            return buildOrderOptLogDo(x, userId, OrderOptTypeEnum.ORDER_DELETE.getDesc(), null);
+        }).collect(Collectors.toList());
+        orderOptLogService.saveBatch(orderOptLogDOS);
         return ServerResult.success();
     }