Merge branch 'feature-2020/6/29-1.9.29-围餐-会阳' into develop

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -942,15 +942,17 @@ public class OrderServiceImpl implements Orderservice {
         }
 
         if (IappIdType.WC_XCX.getCode().equals(userInfo.getIappId())) {
-            queryOrderResponseVo.getProducts().stream().forEach(each -> {
-                orderBean.getProductList().forEach(var -> {
-                    if (var.getId() == each.getId()) {
-                        each.setSaleTotalAmount(var.getSettlementPrice());
-                        each.setOriginalTotalAmount(var.getSettlementPrice());
-                    }
-                });
+            if(CollectionUtils.isNotEmpty(queryOrderResponseVo.getProducts()) ) {
+                queryOrderResponseVo.getProducts().stream().forEach(each -> {
+                    orderBean.getProductList().forEach(var -> {
+                        if (var.getId() == each.getId()) {
+                            each.setSaleTotalAmount(var.getSettlementPrice());
+                            each.setOriginalTotalAmount(var.getSettlementPrice());
+                        }
+                    });
 
-            });
+                });
+            }
         }
 
         // 判断是否有裂变活动 订单扩展信息判断必须有wxappid