bug fix

liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/vo/MerchantFieldAppliesVo.java

@@ -7,8 +7,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 
 @ApiModel(value = "MerchantFieldAppliesVo", description = "申请的场地")
 @Data
@@ -40,7 +40,8 @@ public class MerchantFieldAppliesVo implements java.io.Serializable, Cloneable {
     @ApiModelProperty(position = 20, value = "介绍[1000]")
     private String description;
     @ApiModelProperty(position = 21, value = "建立日期[YYYY-MM-DD]")
-    private String builtDate;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_SMALL_STR)
+    private LocalDate builtDate;
 
     @ApiModelProperty(position = 22, value = "省id")
     private String provinceId;
@@ -123,7 +124,7 @@ public class MerchantFieldAppliesVo implements java.io.Serializable, Cloneable {
         this.setLogo(source.getLogo());
         this.setBackground(source.getBackground());
         this.setDescription(source.getDescription());
-        this.setBuiltDate(source.getBuiltDate().format(DateTimeFormatter.ofPattern(DateUtil.DATE_SMALL_STR)));
+        this.setBuiltDate(source.getBuiltDate());
 
         this.setProvinceId(source.getProvinceId());
         this.setProvinceName(source.getProvinceName());

liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/vo/MerchantFieldsVo.java

@@ -7,8 +7,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 
 @ApiModel(value = "MerchantFieldsVo", description = "场地")
 @Data
@@ -36,7 +36,8 @@ public class MerchantFieldsVo implements java.io.Serializable, Cloneable {
     @ApiModelProperty(position = 19, value = "介绍[1000]")
     private String description;
     @ApiModelProperty(position = 20, value = "建立日期[YYYY-MM-DD]")
-    private String builtDate;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_SMALL_STR)
+    private LocalDate builtDate;
 
     @ApiModelProperty(position = 21, value = "省id")
     private String provinceId;
@@ -97,7 +98,7 @@ public class MerchantFieldsVo implements java.io.Serializable, Cloneable {
         this.setLogo(source.getLogo());
         this.setBackground(source.getBackground());
         this.setDescription(source.getDescription());
-        this.setBuiltDate(source.getBuiltDate().format(DateTimeFormatter.ofPattern(DateUtil.DATE_SMALL_STR)));
+        this.setBuiltDate(source.getBuiltDate());
 
         this.setProvinceId(source.getProvinceId());
         this.setProvinceName(source.getProvinceName());

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantFieldAppliesServiceImpl.java

@@ -2,10 +2,7 @@ package com.liquidnet.service.merchant.service.impl;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.liquidnet.common.exception.LiquidnetServiceException;
-import com.liquidnet.commons.lang.util.CollectionUtil;
-import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.commons.lang.util.IdentityUtils;
-import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
@@ -25,7 +22,9 @@ import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.IntStream;
@@ -107,6 +106,8 @@ public class MerchantFieldAppliesServiceImpl implements IMerchantFieldAppliesSer
             fieldAppliesVo.setApplyType("create");
             fieldAppliesVo.setFieldId("");
         }
+        LocalDate builtDate = LocalDate.parse(parameter.getBuiltDate(), DateTimeFormatter.ofPattern(DateUtil.DATE_SMALL_STR));
+        fieldAppliesVo.setBuiltDate(builtDate);
 
         // 身份证检查
         String respStr = IdentityUtils.aliThird(fieldAppliesVo.getLegalName(), fieldAppliesVo.getLegalIdentity());;