feat:东莞市&中山市

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

@@ -3,6 +3,7 @@ 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.google.common.collect.Maps;
 import com.jiejing.common.model.JsonResult;
 import com.jiejing.common.model.JsonResult;
+import com.jiejing.common.utils.text.StringUtil;
 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;
 import com.jiejing.paycenter.api.merchant.request.ApplyMerchantRequest;
 import com.jiejing.paycenter.api.merchant.request.ApplyMerchantRequest;
@@ -59,10 +60,10 @@ public class MerchantRpcService {
 
 
   private void resetAddress(ApplyMerchantRequest request) {
   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());
+    this.resetAddress(null == request.getLegal() ? null : request.getLegal().getLegalAddress());
+    this.resetAddress(null == request.getBankCard() ? null : request.getBankCard().getCardAddress());
+    this.resetAddress(null == request.getLicense() ? null : request.getLicense().getLicenseAddress());
+    this.resetAddress(null == request.getBusiness() ? null : request.getBusiness().getBusinessAddress());
   }
   }
 
 
   private static final Map<String, String> DISTRICT_CODE_MAP = Maps.newHashMap();
   private static final Map<String, String> DISTRICT_CODE_MAP = Maps.newHashMap();
@@ -74,6 +75,12 @@ public class MerchantRpcService {
   }
   }
 
 
   private void resetAddress(Address address) {
   private void resetAddress(Address address) {
+    if (null == address) {
+      return;
+    }
+    if (StringUtil.isBlank(address.getDistrict())) {
+      return;
+    }
     address.setDistrict(DISTRICT_CODE_MAP.getOrDefault(address.getDistrict(), address.getDistrict()));
     address.setDistrict(DISTRICT_CODE_MAP.getOrDefault(address.getDistrict(), address.getDistrict()));
   }
   }