恢复部分代码

soss-framework/src/main/java/com/soss/framework/web/service/WeixinServiceImpl.java

@@ -61,6 +61,7 @@ import java.math.BigDecimal;
 import java.net.InetAddress;
 import java.nio.charset.StandardCharsets;
 import java.security.spec.AlgorithmParameterSpec;
+import java.text.ParseException;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
@@ -632,7 +633,7 @@ public class WeixinServiceImpl  {
         return WxPayNotifyResponse.fail("回调有误!");
     }
 
-    public List<JSONObject> getArea(String lng, String lat, Boolean testFlag) {
+    public List<JSONObject> getArea(String lng, String lat, Boolean testFlag) throws ParseException {
         String provinceString = "[value ='%s'][0].label";
         String cityString = "[value='%s'][0].children[value='%s'][0].label";
         String zoneString = "[value='%s'][0].children[value='%s'][0].children[value='%s'][0].label";
@@ -650,8 +651,10 @@ public class WeixinServiceImpl  {
                 double realDistance = DistanceUtil.getRealDistance(Double.parseDouble(lng), Double.parseDouble(lat), Double.parseDouble(shop1.getLng()), Double.parseDouble(shop1.getLat()));
                 shop1.setRealDistance(realDistance);
                 shop1.setDistance(DistanceUtil.getDistanceDesc(realDistance));
+                appService.perfectOrderState(shop1, lng, lat);
             } else {
                 shop1.setDistance("-1");
+                shop1.setOrderState(1);
             }
             String province = shop1.getProvince();
             if(proString.contains(province)){