楚江ERP:客户资信-序列化问题处理

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.components.redis.RedisHandler;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
+import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
@@ -86,19 +87,12 @@ public class CustomerCreditHistoryController extends DefaultBaseController {
         List<CustomerCreditHistory> query = customerCreditHistoryService.query(vo);
 
         List<GetCustomerCreditHistoryBo> results = null;
-
-        ObjectMapper objectMapper = new ObjectMapper();
         Object o = redisHandler.get(vo.getCreditId());
         UpdateCustomerCreditVo updateCustomerCreditVo = null;
         if (o != null) {
             String jsonString = o.toString();
-            try {
-                // 2. 反序列化为 UpdateCustomerCreditVo 对象
-                updateCustomerCreditVo = objectMapper.readValue(jsonString, UpdateCustomerCreditVo.class);
-            } catch (JsonProcessingException e) {
-                e.printStackTrace(); // 或使用日志
-                throw new RuntimeException("JSON 反序列化失败", e);
-            }
+            // 2. 反序列化为 UpdateCustomerCreditVo 对象
+            updateCustomerCreditVo = JsonUtil.parseObject(jsonString, UpdateCustomerCreditVo.class);
         }
 
         if (!CollectionUtil.isEmpty(query)) {

@@ -65,7 +65,7 @@ public class CustomerCreditHistory extends BaseEntity implements BaseDto {
     private String customerShortName;
 
     /**
-     * 企业类型：经销商（distributor）、终端（terminal）
+     * 企业类型：经销商（DEALER）、终端（TERMINAL）
      */
     @Label("企业类型")
     private String enterpriseType;

@@ -109,20 +109,15 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
      * @param businessId 业务ID
      */
     private void handleCustomerCreditData(String flowStatus, String businessId) {
-        ObjectMapper objectMapper = new ObjectMapper();
         Object o = redisHandler.get(businessId);
         UpdateCustomerCreditVo vo = null;
         if (o != null) {
             String jsonString = o.toString();
-            try {
-                // 2. 反序列化为 UpdateCustomerCreditVo 对象
-                vo = objectMapper.readValue(jsonString, UpdateCustomerCreditVo.class);
-            } catch (JsonProcessingException e) {
-                e.printStackTrace(); // 或使用日志
-                throw new RuntimeException("JSON 反序列化失败", e);
-            }
+            // 2. 反序列化为 UpdateCustomerCreditVo 对象
+            vo = JsonUtil.parseObject(jsonString, UpdateCustomerCreditVo.class);
         }
-        if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)) {
+        if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
+                || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
             //变更通过，更新数据
             if (vo != null) {
                 vo.setStatus("PASS");
@@ -133,7 +128,9 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
                 //非变更审核
                 customerCreditService.updateStatus(businessId, "PASS");
             }
-        } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)) {
+        } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.TERMINATION.getCode().equals(flowStatus)) {
             //变更拒绝，回退历史记录数据
             if (vo != null) {
                 String creditHistoryId = vo.getCreditHistoryId();

@@ -307,6 +307,23 @@ public class CustomerCreditHistoryServiceImpl extends BaseMpServiceImpl<Customer
                             value2 = customer2.getName();
                         }
                     }
+                    //企业类型
+                    if ("enterpriseType".equals(fieldName)) {
+                        if (StringUtil.isNotEmpty(data.getEnterpriseType())) {
+                            if ("TERMINAL".equals(data.getEnterpriseType())) {
+                                value1 = "终端";
+                            } else if ("DEALER".equals(data.getEnterpriseType())) {
+                                value1 = "经销商";
+                            }
+                        }
+                        if (StringUtil.isNotEmpty(customerCreditHistory.getEnterpriseType())) {
+                            if ("TERMINAL".equals(customerCreditHistory.getEnterpriseType())) {
+                                value2 = "终端";
+                            } else if ("DEALER".equals(customerCreditHistory.getEnterpriseType())) {
+                                value2 = "经销商";
+                            }
+                        }
+                    }
                     //调查人
                     if ("investigator".equals(fieldName)) {
                         if (StringUtil.isNotEmpty(data.getInvestigator())) {
@@ -334,6 +351,12 @@ public class CustomerCreditHistoryServiceImpl extends BaseMpServiceImpl<Customer
 
                     Map<Integer, String> changeMap = new LinkedHashMap<>();
                     changeMap.put(1, String.valueOf(index));
+                    if (value1 == null) {
+                        value1 = "";
+                    }
+                    if (value2 == null) {
+                        value2 = "";
+                    }
                     changeMap.put(2, formatValue(value1));
                     changeMap.put(3, formatValue(value2));
 

@@ -725,13 +725,8 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
                 }
                 vo.setCorePersonnelList(corePersonnelList1);
             }
-            ObjectMapper objectMapper = new ObjectMapper();
-            try {
-                String jsonString = objectMapper.writeValueAsString(vo);
-                redisHandler.set(vo.getId(), jsonString);
-            } catch (JsonProcessingException e) {
-                e.printStackTrace();
-            }
+            String jsonString = JsonUtil.toJsonString(vo);
+            redisHandler.set(vo.getId(), jsonString);
         } else {
             //变更审核通过后再修改入库
             LambdaUpdateWrapper<CustomerCredit> updateWrapper = Wrappers.lambdaUpdate(CustomerCredit.class)
@@ -1053,6 +1048,7 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
         }
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
+        cleanCacheByKey(vo.getId());
     }
 
     @OpLog(type = OtherOpLogType.class, name = "更新状态，ID：{}", params = {"#id"})
@@ -1066,6 +1062,7 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
                 .set(CustomerCredit::getStatus, status)
                 .eq(CustomerCredit::getId, id);
         getBaseMapper().update(updateWrapper);
+        cleanCacheByKey(id);
     }
 
     @OpLog(type = OtherOpLogType.class, name = "取消，ID：{}", params = {"#id"})
@@ -1079,6 +1076,7 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
                 .set(CustomerCredit::getStatus, "CANCEL")
                 .eq(CustomerCredit::getId, id);
         getBaseMapper().update(updateWrapper);
+        cleanCacheByKey(id);
     }
 
     @OpLog(type = OtherOpLogType.class, name = "删除客户资信表，ID：{}", params = {"#id"})

@@ -12,6 +12,8 @@ import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.util.List;
 
@@ -39,7 +41,7 @@ public class UpdateCustomerCreditVo implements BaseVo, Serializable {
      */
     @ApiModelProperty("登记日期")
     @TypeMismatch(message = "登记日期格式有误！")
-    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate registerDate;
 
     /**
@@ -112,7 +114,7 @@ public class UpdateCustomerCreditVo implements BaseVo, Serializable {
      */
     @ApiModelProperty("注册时间")
     @TypeMismatch(message = "注册时间格式有误！")
-    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate registrationTime;
 
     /**