feat:address add name

api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/model/AddressInfo.java

@@ -19,18 +19,24 @@ import lombok.NoArgsConstructor;
 @ApiModel(description = "地址")
 @ApiModel(description = "地址")
 public class AddressInfo {
 public class AddressInfo {
 
 
-  @ApiModelProperty(value = "省", required = true)
-  @NotBlank(message = "省份不能为空")
+  @ApiModelProperty(value = "省Code")
   private String province;
   private String province;
 
 
-  @ApiModelProperty(value = "市", required = true)
-  @NotBlank(message = "市不能为空")
+  @ApiModelProperty(value = "市Code")
   private String city;
   private String city;
 
 
-  @ApiModelProperty(value = "区", required = true)
-  @NotBlank(message = "区不能为空")
+  @ApiModelProperty(value = "区Code")
   private String district;
   private String district;
 
 
+  @ApiModelProperty(value = "省名称")
+  private String provinceName;
+
+  @ApiModelProperty(value = "市名称")
+  private String cityName;
+
+  @ApiModelProperty(value = "区名称")
+  private String districtName;
+
   @ApiModelProperty(value = "详细地址", notes = "XX省XX市XX区XX街道")
   @ApiModelProperty(value = "详细地址", notes = "XX省XX市XX区XX街道")
   private String address;
   private String address;
 
 

api/src/main/java/com/jiejing/fitness/finance/api/merchant/vo/AddressVO.java

@@ -18,15 +18,24 @@ import lombok.NoArgsConstructor;
 @ApiModel(description = "地址VO")
 @ApiModel(description = "地址VO")
 public class AddressVO {
 public class AddressVO {
 
 
-  @ApiModelProperty(value = "省")
+  @ApiModelProperty(value = "省Code")
   private String province;
   private String province;
 
 
-  @ApiModelProperty(value = "市")
+  @ApiModelProperty(value = "市Code")
   private String city;
   private String city;
 
 
-  @ApiModelProperty(value = "区")
+  @ApiModelProperty(value = "区Code")
   private String district;
   private String district;
 
 
+  @ApiModelProperty(value = "省名称")
+  private String provinceName;
+
+  @ApiModelProperty(value = "市名称")
+  private String cityName;
+
+  @ApiModelProperty(value = "区名称")
+  private String districtName;
+
   @ApiModelProperty(value = "详细地址", notes = "XX省XX市XX区XX街道")
   @ApiModelProperty(value = "详细地址", notes = "XX省XX市XX区XX街道")
   private String address;
   private String address;
 
 

service/src/main/java/com/jiejing/fitness/finance/service/merchant/convert/MerchantConvert.java

@@ -101,12 +101,7 @@ public class MerchantConvert {
         .mcc(MccEnums.MCC_7941)
         .mcc(MccEnums.MCC_7941)
         .businessType(BusinessTypeEnums.REALITY)
         .businessType(BusinessTypeEnums.REALITY)
         .sceneType(SceneTypeEnums.OFFLINE)
         .sceneType(SceneTypeEnums.OFFLINE)
-        .businessAddress(Address.builder()
-            .province(null == address ? null : address.getProvince())
-            .city(null == address ? null : address.getCity())
-            .district(null == address ? null : address.getDistrict())
-            .address(null == address ? null : address.getAddress())
-            .build())
+        .businessAddress(Optional.ofNullable(address).map(e -> BeanUtil.map(e, Address.class)).orElse(null))
         .build();
         .build();
   }
   }
 
 
@@ -121,12 +116,7 @@ public class MerchantConvert {
         .licenseEndDate(params.getLicense().getLicenseEndDate())
         .licenseEndDate(params.getLicense().getLicenseEndDate())
         .businessScope(params.getLicense().getBusinessScope())
         .businessScope(params.getLicense().getBusinessScope())
         .foundDate(params.getLicense().getFoundDate())
         .foundDate(params.getLicense().getFoundDate())
-        .licenseAddress(Address.builder()
-            .province(null == address ? null : address.getProvince())
-            .city(null == address ? null : address.getCity())
-            .district(null == address ? null : address.getDistrict())
-            .address(null == address ? null : address.getAddress())
-            .build())
+        .licenseAddress(Optional.ofNullable(address).map(e -> BeanUtil.map(e, Address.class)).orElse(null))
         .build();
         .build();
   }
   }
 
 
@@ -147,12 +137,7 @@ public class MerchantConvert {
         .bankName(params.getBankCard().getBankName())
         .bankName(params.getBankCard().getBankName())
         .branchName(params.getBankCard().getBranchName())
         .branchName(params.getBankCard().getBranchName())
         .branchCode(params.getBankCard().getBranchCode())
         .branchCode(params.getBankCard().getBranchCode())
-        .cardAddress(Address.builder()
-            .province(null == address ? null : address.getProvince())
-            .city(null == address ? null : address.getCity())
-            .district(null == address ? null : address.getDistrict())
-            .address(null == address ? null : address.getAddress())
-            .build())
+        .cardAddress(Optional.ofNullable(address).map(e -> BeanUtil.map(e, Address.class)).orElse(null))
         .build();
         .build();
   }
   }
 
 
@@ -166,12 +151,7 @@ public class MerchantConvert {
         .legalCertExpireType(params.getLegal().getLegalCertExpireType())
         .legalCertExpireType(params.getLegal().getLegalCertExpireType())
         .legalCertStartDate(params.getLegal().getLegalCertStartDate())
         .legalCertStartDate(params.getLegal().getLegalCertStartDate())
         .legalCertEndDate(params.getLegal().getLegalCertEndDate())
         .legalCertEndDate(params.getLegal().getLegalCertEndDate())
-        .legalAddress(Address.builder()
-            .province(null == address ? null : address.getProvince())
-            .city(null == address ? null : address.getCity())
-            .district(null == address ? null : address.getDistrict())
-            .address(null == address ? null : address.getAddress())
-            .build())
+        .legalAddress(Optional.ofNullable(address).map(e -> BeanUtil.map(e, Address.class)).orElse(null))
         .build();
         .build();
   }
   }