添加意见反馈添加信息

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/UserOrderDto.java

@@ -48,4 +48,18 @@ public class UserOrderDto extends PageParam {
 	 */
 	String phone;
 
+	/**
+	 * 配送方式:1、线上配送，2、快递配送
+	 */
+	Integer sendType;
+
+	/**
+	 * 1、普通订单，2、定制订单
+	 */
+	Integer type;
+
+	/**
+	 * 发票状态： 1、未开发票，2、已开发票, 3、已发货， 4、已收货、5、退回， 6、已完成
+	 */
+	Integer invoiceStatus;
 }

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/OrderInfoBiz.java

@@ -198,7 +198,9 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 				Map<Integer, List<OrderEInvoice>> map = orderEInvoiceList.stream().collect(Collectors.groupingBy(OrderEInvoice::getId));
 				if (map != null && map.size() > 0) {
 					orderInfoList.parallelStream().forEach(orderInfo -> {
+						if (map.get(orderInfo.getInvoiceId()) != null && orderInfo != null) {
 							orderInfo.setOrderEInvoice(map.get(orderInfo.getInvoiceId()).get(0));
+						}
 					});
 				}
 			}