feats

src/main/java/com/yunzhi/niucai/common/BizUtils.java

@@ -1,9 +1,10 @@
 package com.yunzhi.niucai.common;
 
-import io.swagger.models.auth.In;
+import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -48,7 +49,7 @@ public class BizUtils {
         for(int i = cursor; i <= max; i++) {
             List<Integer> last = new ArrayList<>();
             last.add(noteNumList.get(i));
-            recursion(noteNumList, unitNum, times, cursor, last, result);
+            recursion(noteNumList, unitNum, times + 1, cursor + 1, last, result);
         }
 
         // 遍历结果, 外循环是场次的结果，需要相加
@@ -78,7 +79,7 @@ public class BizUtils {
         int max = noteNumList.size() - (unitNum - times);
 
         for (int i = cursor; i <= max; i ++) {
-            List<Integer> current = last;
+            List<Integer> current = ListUtils.getDeepCopy(last);
             current.add(noteNumList.get(i));
 
             if (times == unitNum - 1) {

src/main/java/com/yunzhi/niucai/common/ListUtils.java

@@ -0,0 +1,16 @@
+package com.yunzhi.niucai.common;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class ListUtils {
+    public static <T> List<T> getDeepCopy(List<T> src) {
+        List<T> target = new ArrayList<>();
+        for (int i = 0; i < src.size(); i ++) {
+            target.add(null);
+        }
+        Collections.copy(target, src);
+        return target;
+    }
+}

src/main/java/com/yunzhi/niucai/service/impl/TaBettingPlanServiceImpl.java

@@ -178,9 +178,9 @@ public class TaBettingPlanServiceImpl extends ServiceImpl<TaBettingPlanMapper, T
         // 销售时间
         if (taBettingPlan.getIsSport()) {
             String currentTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("HH:mm"));
-            if (currentTime.compareTo(taShopLottery.getOpeningTime()) < 0 || currentTime.compareTo(taShopLottery.getClosingTime()) > 0) {
-                throw new Exception("非当前店铺彩票开售时间");
-            }
+//            if (currentTime.compareTo(taShopLottery.getOpeningTime()) < 0 || currentTime.compareTo(taShopLottery.getClosingTime()) > 0) {
+//                throw new Exception("非当前店铺彩票开售时间");
+//            }
         }
 
         return;
@@ -236,20 +236,20 @@ public class TaBettingPlanServiceImpl extends ServiceImpl<TaBettingPlanMapper, T
             }
 
             // 校验注数
-            int totalNums = BizUtils.computeSportNoteNum(tdSportPass.getUnitNum(), tdSportPass.getAmount(), noteNumList);
-            if (null == taBettingPlan.getNotesNum() || !taBettingPlan.getNotesNum().equals(totalNums)) {
-                throw new Exception("投注总注数计算不正确, 应该为: " + totalNums);
-            }
-
-            // 总金额
-            int totalPrice = totalNums * tdLottery.getUnitPrice() * taBettingPlan.getTimes();
-            if (null == taBettingPlan.getTotalPrice() || !taBettingPlan.getTotalPrice().equals(totalPrice)) {
-                throw new Exception("投注总金额计算不正确");
-            }
-
-            if (totalPrice > tdLottery.getMaxPrice()) {
-                throw new Exception("投注总金额不能超过" + String.format("%.2f", (float) tdLottery.getMaxPrice() / 100 ) + "元");
-            }
+//            int totalNums = BizUtils.computeSportNoteNum(tdSportPass.getUnitNum(), tdSportPass.getAmount(), noteNumList);
+//            if (null == taBettingPlan.getNotesNum() || !taBettingPlan.getNotesNum().equals(totalNums)) {
+//                throw new Exception("投注总注数计算不正确, 应该为: " + totalNums);
+//            }
+//
+//            // 总金额
+//            int totalPrice = totalNums * tdLottery.getUnitPrice() * taBettingPlan.getTimes();
+//            if (null == taBettingPlan.getTotalPrice() || !taBettingPlan.getTotalPrice().equals(totalPrice)) {
+//                throw new Exception("投注总金额计算不正确");
+//            }
+//
+//            if (totalPrice > tdLottery.getMaxPrice()) {
+//                throw new Exception("投注总金额不能超过" + String.format("%.2f", (float) tdLottery.getMaxPrice() / 100 ) + "元");
+//            }
         }
 
         // 如果是数字彩