下单时校验订单中sku数量

soss-admin/src/main/java/com/soss/web/controller/coffee/WeixinController.java

@@ -109,7 +109,7 @@ public class WeixinController {
         boolean testFlag = false;
         if (loginUser != null) {
             Customer customer = customerService.selectCustById(loginUser.getOpenId());
-            if(customer!=null) {
+            if (customer != null) {
                 testFlag = customer.getTestFlag();
             }
         }
@@ -123,7 +123,7 @@ public class WeixinController {
         boolean testFlag = false;
         if (loginUser != null) {
             Customer customer = customerService.selectCustById(loginUser.getOpenId());
-            if(customer!=null) {
+            if (customer != null) {
                 testFlag = customer.getTestFlag();
             }
         }

soss-system/src/main/java/com/soss/system/service/impl/AppServiceImpl.java

@@ -95,13 +95,15 @@ public class AppServiceImpl {
         }
 
         // 超出最大配送距离10KM 或 超出店铺设置最大距离
-        double realDistance = DistanceUtil.getRealDistance(Double.parseDouble(lng), Double.parseDouble(lat), Double.parseDouble(shop.getLng()), Double.parseDouble(shop.getLat()));
-        double realKm = realDistance / 1000;
-        double shopLimit = shop.getDistanceLimit() == null ? 0 : shop.getDistanceLimit();
-        if (realKm > 10 || realKm > shopLimit) {
-            shop.setOrderState(0);
-            shop.setStateDesc("距离较远，门店暂停接单");
-            return false;
+        if (!StringUtils.isEmpty(lng) && !StringUtils.isEmpty(lat)) {
+            double realDistance = DistanceUtil.getRealDistance(Double.parseDouble(lng), Double.parseDouble(lat), Double.parseDouble(shop.getLng()), Double.parseDouble(shop.getLat()));
+            double realKm = realDistance / 1000;
+            double shopLimit = shop.getDistanceLimit() == null ? 0 : shop.getDistanceLimit();
+            if (realKm > 10 || realKm > shopLimit) {
+                shop.setOrderState(0);
+                shop.setStateDesc("距离较远，门店暂停接单");
+                return false;
+            }
         }
 
         shop.setOrderState(1);