Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminOrderController.java

@@ -35,7 +35,6 @@ import com.iamberry.rst.faces.sms.MessageService;
 import com.iamberry.rst.faces.sms.SmsService;
 import com.iamberry.rst.faces.sys.SysService;
 import com.iamberry.rst.utils.*;
-import com.iamberry.wechat.core.entity.OrderUtil;
 import com.iamberry.wechat.tools.DateTimeUtil;
 import com.iamberry.wechat.tools.ObjectExcelView;
 import com.iamberry.wechat.tools.ResponseJson;
@@ -1288,6 +1287,9 @@ public class AdminOrderController {
            throw new Exception();
         }
 
+        //获取省份
+        List<Province> provinceList = addressService.listProvince(new Province());
+
         for (EfastOrder efastOrder: orderEfasts) {
 
             String orderRemark = efastOrder.getOrderRemark();
@@ -1355,20 +1357,33 @@ public class AdminOrderController {
                 salesOrder.setSalesAddressInfo(efastOrder.getOrderProvince()+" "+efastOrder.getOrderCity()+" "+efastOrder.getOrderArea()+" "+myaddress);
                 try{
                     String orderProvince  = efastOrder.getOrderProvince();
-                    orderProvince = orderProvince.replaceAll("省|自治区|壮族自治区|特别行政区","");
-                    Province province = new Province();
-                    province.setProvince(orderProvince);
-                    List<Province> provinceList = addressService.listProvince(province);
+                    orderProvince = orderProvince.replaceAll("省|自治区|壮族自治区|特别行政区|维吾尔自治区","");
+
                     if(provinceList != null && provinceList.size() >0 ){
+                        int provinceIdNum = 0;
+                        int provinceId = 0;
+                        for (Province proiv:provinceList) {
+                            int proNum = 0;
+                            String newPro = proiv.getProvince().replaceAll("省|自治区|壮族自治区|特别行政区|维吾尔自治区","");
+                            if(newPro.indexOf(orderProvince) > -1){
+                                proNum++;
+                            }
+                            if(orderProvince.indexOf(newPro) > -1){
+                                proNum++;
+                            }
+                            if(proNum > provinceIdNum){
+                                provinceIdNum = proNum;
+                                provinceId = proiv.getProvinceId();
+                            }
+                        }
                         String orderCity  = efastOrder.getOrderCity();
                         orderCity = orderCity.replaceAll("市|州|地区|自治区|特别行政区","");
 
                         int cityNum = 0;
                         Integer cityId = null;
 
-                        province = provinceList.get(0);
                         City city = new City();
-                        city.setProvinceId(province.getProvinceId());
+                        city.setProvinceId(provinceId);
                         List<City> cityList = addressService.listCity(city);
                         for (City ci:cityList) {
                             int ciNum = 0;