Ver Fonte

fix(order):优化订单等级信息处理逻辑- 添加空列表检查避免空指针异常
-重构等级信息匹配逻辑提升代码可读性- 保持原有功能逻辑不变

SheepHy há 2 dias atrás
pai
commit
6558913adc

+ 8 - 5
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/OrderServiceImpl.java

@@ -1128,11 +1128,14 @@ public class OrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> impl
             appOrderProInfo
                     .setOrderId(appOrder.getId())
                     .setOrderCode(appOrder.getOrderCode());
-            createOrderForm.getAddGradeLevelInformation().forEach(addGradeLevelInformation -> {
-                if(appOrderProInfo.getFamilyUserId().equals(addGradeLevelInformation.getFamilyId())){
-                    appOrderProInfo.setLevelInfo(addGradeLevelInformation.getLevelInfo());
-                }
-            });
+            List<CreateOrderForm.AddGradeLevelInformation> addGradeLevelInformation1 = createOrderForm.getAddGradeLevelInformation();
+            if(!addGradeLevelInformation1.isEmpty()){
+                addGradeLevelInformation1.forEach(addGradeLevelInformation -> {
+                    if(appOrderProInfo.getFamilyUserId().equals(addGradeLevelInformation.getFamilyId())){
+                        appOrderProInfo.setLevelInfo(addGradeLevelInformation.getLevelInfo());
+                    }
+                });
+            }
             if (!Objects.equals(appOrderProInfo.getType(), CommonConstant.ORDER_PRO_INFO_TYPE_4)) {
                 appOrderProInfo.setTicketNo(RandomUtil.randomNumbers(10));
             }