修改小白卡接口参数

new-user/src/main/java/com/winsun/common/CityCode.java

@@ -352,11 +352,11 @@ public enum CityCode {
     c8654300("8654300","阿勒泰地区"),
     c8654300("8654300","阿勒泰地区"),
     c8659000("8659000","自治区直辖县级行政区划");
     c8659000("8659000","自治区直辖县级行政区划");
 
 
-    private String city;
-
     private String code;
     private String code;
 
 
-    CityCode(String city, String code) {
+    private String city;
+
+    CityCode(String code, String city) {
         this.city = city;
         this.city = city;
         this.code = code;
         this.code = code;
     }
     }
@@ -378,5 +378,4 @@ public enum CityCode {
         }
         }
         return "";
         return "";
     }
     }
-
 }
 }

new-user/src/main/java/com/winsun/controller/PackageNewClothes.java

@@ -470,9 +470,14 @@ public class PackageNewClothes {
                 return ResponseData.error("请选择邮寄地区");
                 return ResponseData.error("请选择邮寄地区");
             }
             }
 
 
+            String code = CityCode.getCodeByCity(shi);
+            if (StringUtils.isBlank(code)) {
+                return ResponseData.error("所选地区小白卡无法配送");
+            }
+
             // 根据市获取编号
             // 根据市获取编号
             jsonObject = XbkUtil.xbkOrderJT0002(businessNumber, idCard,
             jsonObject = XbkUtil.xbkOrderJT0002(businessNumber, idCard,
-                    customerName, contactNumber, xbId, netId, CityCode.getCodeByCity(shi), address);
+                    customerName, contactNumber, xbId, netId, code, address);
         } catch (Exception e) {
         } catch (Exception e) {
             log.error("小白卡下单接口调用异常", e.getMessage());
             log.error("小白卡下单接口调用异常", e.getMessage());
         }
         }