需求

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

@@ -1170,18 +1170,17 @@ public class OrderBaseExcelLogic {
 
                     }else {
 
-
-                        //生成新的产品数据
-                        pgOrderProductService.saveBatch(pgOrderProductList);
                         //生成新的待采集数据
                         int sort = 0;
                         List<PgOrderProductDetail> newProductDetail = new ArrayList<>();
-                        for (PgOrderProduct pgOrderProductOne : pgOrderProducts) {
-                            PgOrderProductDetail pgOrderProductDetail = BeanUtil.toBean(pgOrderProductOne, PgOrderProductDetail.class);
+                        while(true){
+                            if (sort > pgOrderProduct.getNum())
+                                break;
+                            PgOrderProductDetail pgOrderProductDetail = BeanUtil.toBean(pgOrderProduct, PgOrderProductDetail.class);
                             pgOrderProductDetail.setId(null);
                             pgOrderProductDetail.setNum(1);
                             pgOrderProductDetail.setSort(sort + 1);
-                            pgOrderProductDetail.setOrderProductId(pgOrderProductOne.getId());
+                            pgOrderProductDetail.setOrderProductId(pgOrderProduct.getId());
                             newProductDetail.add(pgOrderProductDetail);
                             sort++;
                         }