需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseExcelLogic.java

@@ -1158,6 +1158,8 @@ public class OrderBaseExcelLogic {
                                 .filter(item -> !item.getStatus().equals("WAIT")).collect(Collectors.toList());
 
                         for (PgOrderProductDetail pgOrderProductDetail : pgOrderProductDetailList) {
+                            if (sort >= pgOrderProduct.getNum())
+                                break;
                             pgOrderProductDetail.setSort(sort+1);
                             pgOrderProductDetail.setOrderProductId(pgOrderProduct.getProductId());
 
@@ -1169,7 +1171,7 @@ public class OrderBaseExcelLogic {
                                 .filter(item -> item.getStatus().equals("WAIT")).collect(Collectors.toList());
 
                         for (PgOrderProductDetail pgOrderProductDetail : pgOrderProductDetailListWait) {
-                            if (sort > pgOrderProduct.getNum())
+                            if (sort >= pgOrderProduct.getNum())
                                 break;
                             pgOrderProductDetail.setSort(sort+1);
                             pgOrderProductDetail.setOrderProductId(pgOrderProduct.getProductId());

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -1385,6 +1385,8 @@ public class OrderBaseLogic {
                     .filter(item -> !item.getStatus().equals("WAIT")).collect(Collectors.toList());
 
             for (PgOrderProductDetail pgOrderProductDetail : pgOrderProductDetailList) {
+                if (sort >= pgOrderProducts.getNum())
+                    break;
                 pgOrderProductDetail.setSort(sort + 1);
                 pgOrderProductDetail.setOrderProductId(pgOrderProducts.getProductId());
 
@@ -1396,7 +1398,7 @@ public class OrderBaseLogic {
                     .filter(item -> item.getStatus().equals("WAIT")).collect(Collectors.toList());
 
             for (PgOrderProductDetail pgOrderProductDetail : pgOrderProductDetailListWait) {
-                if (sort > pgOrderProducts.getNum())
+                if (sort >= pgOrderProducts.getNum())
                     break;
                 pgOrderProductDetail.setSort(sort + 1);
                 pgOrderProductDetail.setOrderProductId(pgOrderProducts.getProductId());