feat:reset address

service/src/main/java/com/jiejing/fitness/finance/service/rpc/MerchantRpcService.java

 package com.jiejing.fitness.finance.service.rpc;
 package com.jiejing.fitness.finance.service.rpc;
 
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.google.common.collect.Maps;
 import com.jiejing.common.model.JsonResult;
 import com.jiejing.common.model.JsonResult;
 import com.jiejing.paycenter.api.merchant.MerchantApi;
 import com.jiejing.paycenter.api.merchant.MerchantApi;
 import com.jiejing.paycenter.api.merchant.MerchantQueryApi;
 import com.jiejing.paycenter.api.merchant.MerchantQueryApi;
@@ -11,6 +12,7 @@ import com.jiejing.paycenter.api.merchant.request.GetMerchantByIdRequest;
 import com.jiejing.paycenter.api.merchant.request.ListMerchantByIdsRequest;
 import com.jiejing.paycenter.api.merchant.request.ListMerchantByIdsRequest;
 import com.jiejing.paycenter.api.merchant.request.SyncSubChannelAuthRequest;
 import com.jiejing.paycenter.api.merchant.request.SyncSubChannelAuthRequest;
 import com.jiejing.paycenter.api.merchant.request.UploadRequest;
 import com.jiejing.paycenter.api.merchant.request.UploadRequest;
+import com.jiejing.paycenter.common.model.request.Address;
 import com.jiejing.paycenter.common.model.vo.ApplyMerchantResultVO;
 import com.jiejing.paycenter.common.model.vo.ApplyMerchantResultVO;
 import com.jiejing.paycenter.common.model.vo.AuthSubChannelVO;
 import com.jiejing.paycenter.common.model.vo.AuthSubChannelVO;
 import com.jiejing.paycenter.common.model.vo.ConfigSubChannelVO;
 import com.jiejing.paycenter.common.model.vo.ConfigSubChannelVO;
@@ -22,6 +24,7 @@ import com.jiejing.paycenter.common.enums.merchant.SubChannelAuthTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.SubChannelConfigTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.SubChannelConfigTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums;
 import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -47,11 +50,33 @@ public class MerchantRpcService {
   }
   }
 
 
   public ApplyMerchantResultVO apply(ApplyMerchantRequest request) {
   public ApplyMerchantResultVO apply(ApplyMerchantRequest request) {
+    // 重新映射下地址信息：系统行政区划存在错误，需要订正
+    this.resetAddress(request);
     JsonResult<ApplyMerchantResultVO> result = merchantApi.apply(request);
     JsonResult<ApplyMerchantResultVO> result = merchantApi.apply(request);
     result.assertSuccess();
     result.assertSuccess();
     return result.getResult();
     return result.getResult();
   }
   }
 
 
+  private void resetAddress(ApplyMerchantRequest request) {
+    // 重新映射下地址信息：系统行政区划存在错误，需要订正
+    this.resetAddress(request.getLegal().getLegalAddress());
+    this.resetAddress(request.getBankCard().getCardAddress());
+    this.resetAddress(request.getLicense().getLicenseAddress());
+    this.resetAddress(request.getBusiness().getBusinessAddress());
+  }
+
+  private static final Map<String, String> DISTRICT_CODE_MAP = Maps.newHashMap();
+  static {
+    // 东莞市
+    DISTRICT_CODE_MAP.put("441901", "441900");
+    // 中山市
+    DISTRICT_CODE_MAP.put("442001", "442000");
+  }
+
+  private void resetAddress(Address address) {
+    address.setDistrict(DISTRICT_CODE_MAP.getOrDefault(address.getDistrict(), address.getDistrict()));
+  }
+
   public MerchantVO getByMerchantId(Long merchantId) {
   public MerchantVO getByMerchantId(Long merchantId) {
     GetMerchantByIdRequest request = GetMerchantByIdRequest.builder().merchantId(merchantId).build();
     GetMerchantByIdRequest request = GetMerchantByIdRequest.builder().merchantId(merchantId).build();
     JsonResult<MerchantVO> result = merchantQueryApi.getById(request);
     JsonResult<MerchantVO> result = merchantQueryApi.getById(request);