|
|
@@ -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));
|
|
|
}
|