cup 2 years ago
parent
commit
7ebae36883

+ 54 - 18
mp-service/src/main/java/com/qs/mp/admin/service/impl/TicketBoxServiceImpl.java

@@ -100,6 +100,44 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
     return getBaseMapper().listBySaleChannel(queryWrapper);
   }
 
+  public static void main(String[] args) {
+
+    String  test = "1";
+    String[] split = test.split("\\.");
+    for (String s : split) {
+      System.out.println("s = " + s);
+    }
+
+
+    List<String> channelNoList = new ArrayList<>();
+    channelNoList.add("1");
+    channelNoList.add("25.1.31");
+    channelNoList.add("47");
+    for (int i = 0; i < channelNoList.size(); i++) {
+      for (int j = 0; j < channelNoList.size(); j++) {
+        if (i == j) {
+          continue;
+        }
+
+        String[] a = channelNoList.get(i).split("\\.");
+        String[] b = channelNoList.get(j).split("\\.");
+
+        for (String s : a) {
+          for (String s1 : b) {
+            if (s.equals(s1)) {
+              System.out.println("i = " + channelNoList.get(i));
+              System.out.println("j = " + channelNoList.get(j));
+              System.out.println("重复了");
+            }
+          }
+        }
+
+
+      }
+    }
+  }
+
+
   @Override
   @Transactional(rollbackFor = Exception.class)
   public boolean updateTicketBox(TicketBoxUpdateParam param) {
@@ -143,8 +181,14 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
           if (i == j) {
             continue;
           }
-          if (channelNoList.get(i).contains(channelNoList.get(j))) {
-            throw new ServiceException("已选择更高级的渠道,不支持渠道相互嵌套!");
+          String[] splitOne = channelNoList.get(i).split("\\.");
+          String[] splitTwo = channelNoList.get(j).split("\\.");
+          for (String one : splitOne) {
+            for (String two : splitTwo) {
+              if (one.equals(two)) {
+                throw new ServiceException("已选择更高级的渠道,不支持渠道相互嵌套!");
+              }
+            }
           }
         }
       }
@@ -335,8 +379,14 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
           if (i == j) {
             continue;
           }
-          if (channelNoList.get(i).contains(channelNoList.get(j))) {
-            throw new ServiceException("已选择更高级的渠道,不支持渠道相互嵌套!");
+          String[] splitOne = channelNoList.get(i).split("\\.");
+          String[] splitTwo = channelNoList.get(j).split("\\.");
+          for (String one : splitOne) {
+            for (String two : splitTwo) {
+              if (one.equals(two)) {
+                throw new ServiceException("已选择更高级的渠道,不支持渠道相互嵌套!");
+              }
+            }
           }
         }
       }
@@ -663,18 +713,4 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
       this.quantity = quantity;
     }
   }
-
-  public static void main(String[] args) {
-    List<PkgAwards> prizes = new ArrayList<>();
-    prizes.add(new PkgAwards("1", "一等奖", 1, 1));
-    prizes.add(new PkgAwards("2", "二等奖", 2, 2));
-    prizes.add(new PkgAwards("3", "三等奖", 3, 3));
-    prizes.add(new PkgAwards("4", "四等奖", 4, 4));
-    TicketBoxServiceImpl boxService = new TicketBoxServiceImpl();
-    System.out.println(boxService.getRandomList(new ArrayList<>(), 10, 10));
-    /*for (int i = 0 ; i < 10; i ++ ) {
-      int random = boxService.getPrizeIndex(prizes);
-      System.out.println(random);
-    }*/
-  }
 }