下单时校验订单中sku数量

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

@@ -139,22 +139,22 @@ public class SysBannerServiceImpl implements ISysBannerService {
         bannerVo.setState(banner.getState());
 
         if (!StringUtils.isEmpty(banner.getProvince())) {
-            String str = banner.getProvince().substring(1, banner.getProvince().length() - 1);
+            String str = trim(banner.getProvince());
             bannerVo.setProvinceStr(str);
             bannerVo.setProvince(str.split(","));
         }
         if (!StringUtils.isEmpty(banner.getCity())) {
-            String str = banner.getCity().substring(1, banner.getCity().length() - 1);
+            String str = trim(banner.getCity());
             bannerVo.setCityStr(str);
             bannerVo.setCity(str.split(","));
         }
         if (!StringUtils.isEmpty(banner.getArea())) {
-            String str = banner.getArea().substring(1, banner.getArea().length() - 1);
+            String str = trim(banner.getArea());
             bannerVo.setAreaStr(str);
             bannerVo.setArea(str.split(","));
         }
         if (!StringUtils.isEmpty(banner.getShopIds())) {
-            String str = banner.getShopIds().substring(1, banner.getShopIds().length() - 1);
+            String str = trim(banner.getShopIds());
             bannerVo.setShopIdsStr(str);
             String[] shopIds = str.split(",");
             Long[] ids = new Long[shopIds.length];
@@ -166,6 +166,13 @@ public class SysBannerServiceImpl implements ISysBannerService {
         return bannerVo;
     }
 
+    private String trim(String str) {
+        if (StringUtils.isEmpty(str)) {
+            return str;
+        }
+        return str.substring(1, str.length() - 1);
+    }
+
     public List<BannerVo> copyBanner(List<SysBanner> banners) {
         List<BannerVo> bannerVos = new ArrayList<>();
         if (CollectionUtils.isEmpty(banners)) {
@@ -214,7 +221,12 @@ public class SysBannerServiceImpl implements ISysBannerService {
         List<SysBanner> list = new ArrayList<>();
         banners.forEach(banner -> {
             if (!StringUtils.isEmpty(banner.getProvince())) {
-                Arrays.stream(banner.getProvince().split(",")).forEach(p -> {
+                String province = trim(banner.getProvince());
+                if (province.equals("0")) {
+                    list.add(banner);
+                    return;
+                }
+                Arrays.stream(province.split(",")).forEach(p -> {
                     if (p.equals(shop.getProvince())) {
                         list.add(banner);
                         return;
@@ -222,7 +234,8 @@ public class SysBannerServiceImpl implements ISysBannerService {
                 });
             }
             if (!StringUtils.isEmpty(banner.getCity())) {
-                Arrays.stream(banner.getCity().split(",")).forEach(p -> {
+                String city = trim(banner.getCity());
+                Arrays.stream(city.split(",")).forEach(p -> {
                     if (p.equals(shop.getCity())) {
                         list.add(banner);
                         return;
@@ -230,7 +243,8 @@ public class SysBannerServiceImpl implements ISysBannerService {
                 });
             }
             if (!StringUtils.isEmpty(banner.getArea())) {
-                Arrays.stream(banner.getArea().split(",")).forEach(p -> {
+                String area = trim(banner.getArea());
+                Arrays.stream(area.split(",")).forEach(p -> {
                     if (p.equals(shop.getZone())) {
                         list.add(banner);
                         return;
@@ -238,7 +252,8 @@ public class SysBannerServiceImpl implements ISysBannerService {
                 });
             }
             if (!StringUtils.isEmpty(banner.getShopIds())) {
-                Arrays.stream(banner.getShopIds().split(",")).forEach(p -> {
+                String shopIds = trim(banner.getShopIds());
+                Arrays.stream(shopIds.split(",")).forEach(p -> {
                     if (p.equals(String.valueOf(shop.getId()))) {
                         list.add(banner);
                         return;
@@ -264,6 +279,11 @@ public class SysBannerServiceImpl implements ISysBannerService {
         List<String> list = new ArrayList<>();
         banners.forEach(banner -> {
             if (!StringUtils.isEmpty(banner.getProvince())) {
+                String province = trim(banner.getProvince());
+                if (province.equals("0")) {
+                    list.add(banner.getImage());
+                    return;
+                }
                 Arrays.stream(banner.getProvince().split(",")).forEach(p -> {
                     if (p.equals(shop.getProvince())) {
                         list.add(banner.getImage());
@@ -272,7 +292,8 @@ public class SysBannerServiceImpl implements ISysBannerService {
                 });
             }
             if (!StringUtils.isEmpty(banner.getCity())) {
-                Arrays.stream(banner.getCity().split(",")).forEach(p -> {
+                String city = trim(banner.getCity());
+                Arrays.stream(city.split(",")).forEach(p -> {
                     if (p.equals(shop.getCity())) {
                         list.add(banner.getImage());
                         return;
@@ -280,7 +301,8 @@ public class SysBannerServiceImpl implements ISysBannerService {
                 });
             }
             if (!StringUtils.isEmpty(banner.getArea())) {
-                Arrays.stream(banner.getArea().split(",")).forEach(p -> {
+                String area = trim(banner.getArea());
+                Arrays.stream(area.split(",")).forEach(p -> {
                     if (p.equals(shop.getZone())) {
                         list.add(banner.getImage());
                         return;
@@ -288,7 +310,8 @@ public class SysBannerServiceImpl implements ISysBannerService {
                 });
             }
             if (!StringUtils.isEmpty(banner.getShopIds())) {
-                Arrays.stream(banner.getShopIds().split(",")).forEach(p -> {
+                String shopIds = trim(banner.getShopIds());
+                Arrays.stream(shopIds.split(",")).forEach(p -> {
                     if (p.equals(String.valueOf(shop.getId()))) {
                         list.add(banner.getImage());
                         return;