新增门店保存citycode

lb-app/src/main/java/com/ydd/app/dto/StoreDto.java

@@ -134,5 +134,6 @@ public class StoreDto extends  BaseDto implements Serializable {
      * poi地址
      */
     private String poiAddress;
+    private String cityCode;
 
 }

lb-app/src/main/java/com/ydd/app/service/impl/ApiStoreServiceImpl.java

@@ -80,10 +80,14 @@ public class ApiStoreServiceImpl implements ApiStoreService {
         JSONObject resp = new JSONObject();
         Member member = iMemberService.getById(loginId);
         Map<String, Object> map = AddressLngLatExchanger.addressToLngAndLag(shopReq.getAddress());
+        if(map==null){
+            return ResponseResult.error(ResponseResultCodeEnum.SHOP_ADDRESS_INVALID);
+        }
         double distance = CoordinateUtils.getDistance(Double.parseDouble(map.get("lng") + ""), Double.parseDouble(map.get("lat") + ""), Double.parseDouble(shopReq.getLongitude()), Double.parseDouble(shopReq.getLatitude()));
         if (distance > 50) {
             return ResponseResult.error(ResponseResultCodeEnum.SHOP_ADDRESS_ERROR);
         }
+        shopReq.setCityCode(map.get("cityCode")+"");
         AipOcr client = new AipOcr("23831014", "BELGCxGTPOlcZzeZ85OLyIpD", "pLt8IG1PoXZBaDonLfFM9EkXndI1OBxh");
         String idCardName = "";
         if (StringUtils.isNotBlank(shopReq.getIdcardFront())) {
@@ -219,7 +223,7 @@ public class ApiStoreServiceImpl implements ApiStoreService {
         //  shop.setDoorHeadPhoto(shopReq.getHouseNumber());
         shop.setLat(shopReq.getLatitude());
         shop.setLng(shopReq.getLongitude());
-        // shop.setCityCode(shopReq.getCityCode());
+         shop.setCityCode(shopReq.getCityCode());
         shop.setMobile(shopReq.getContactPhone());
         shop.setName(shopReq.getShopName());
         shop.setStreet(shopReq.getHouseNumber());
@@ -352,7 +356,7 @@ public class ApiStoreServiceImpl implements ApiStoreService {
                 return ResponseResult.error(ResponseResultCodeEnum.SHOP_EXIST);
             }
         }
-
+        storeDto.setCityCode(shop.getCityCode());
         shop = shopBean(shop, storeDto);
         if (storeDto.getCategoryId() != null) {
             shop.setCategoryId(storeDto.getCategoryId());

lb-common/src/main/java/com/ydd/common/enums/ResponseResultCodeEnum.java

@@ -45,7 +45,7 @@ public enum ResponseResultCodeEnum {
     USER_MOBILE_EXIST(2016, "手机号码已注册"),
     VALUATION_ERR(2021, "计价失败"),
     REFRESH_TOKEN_INVALID(2022, "token已失效"),
-
+    SHOP_ADDRESS_INVALID(2023, "地址解析失败"),
 
     VALUATION_INVALID(2030, "计价已失效, 请重新计价"),
     AMOUNT_NOT_ENOUGH(2031, "账户余额不足"),

lb-third/lb-third-common/src/main/java/com/ydd/third/common/utils/AddressLngLatExchanger.java

@@ -38,8 +38,9 @@ public class AddressLngLatExchanger {
             location = c.get("location").toString();
             cityCode = c.get("citycode").toString();
         } catch (Exception e) {
-            e.printStackTrace();
-            //  System.out.println("失败!");
+         //   e.printStackTrace();
+            log.error("解析地址失败",e);
+            return null;
         }
         return stringToMap(location, cityCode);
     }