添加通知信息

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

@@ -15,6 +15,9 @@ public class UserOrderDto extends PageParam {
 	//订单状态：1--创建订单，2--待付款，3--已支付，4--已发货,5--已完成 -1、删除，-2、取消
 	Integer status;
 
+	//订单状态：1--创建订单，2--待付款，3--已支付，4--已发货,5--已完成 -1、删除，-2、取消
+	Integer newStatus;
+
 	//商品名称
 	String name;
 

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

@@ -160,6 +160,9 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 		if (userOrderDto.getStatus() != null) {
 			orderInfoCriteria.andEqualTo("status", userOrderDto.getStatus());
 		}
+		if (userOrderDto.getNewStatus() != null) {
+			orderInfoCriteria.andEqualTo("status", userOrderDto.getNewStatus());
+		}
 		if (userOrderDto.getPayStatus() != null) {
 			orderInfoCriteria.andEqualTo("payStatus", userOrderDto.getPayStatus());
 		}
@@ -175,6 +178,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 					.orLike("phone", "%" + userOrderDto.getKeywords() + "%")
 					.orLike("orderNo", "%" + userOrderDto.getKeywords() + "%");
 		}
+
 		orderInfoCriteria.andNotEqualTo("status", -1);
 		example.orderBy("updTime").desc();
 		PageDataVO<OrderInfo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example));
@@ -668,6 +672,9 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 		if (StringUtils.isNotBlank(userOrderDto.getName())) {
 			orderInfoCriteria.andLike("realName", "%" + userOrderDto.getName() + "%");
 		}
+		if (userOrderDto.getNewStatus() != null) {
+			orderInfoCriteria.andEqualTo("status", userOrderDto.getNewStatus());
+		}
 		if (StringUtils.isNotBlank(userOrderDto.getKeywords())) {
 			orderInfoCriteria.andLike("realName", "%" + userOrderDto.getKeywords() + "%")
 					.orLike("realName", "%" + userOrderDto.getKeywords() + "%")