添加通知信息

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

@@ -669,11 +669,11 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 		if (userOrderDto.getSendType() != null) {
 			orderInfoCriteria.andEqualTo("sendType", userOrderDto.getSendType());
 		}
-		if (userOrderDto.getInvoiceStatus() != null && userOrderDto.getInvoiceStatus() >= 1) {
-			orderInfoCriteria.andGreaterThan("invoiceStatus", userOrderDto.getInvoiceStatus()).andIsNotNull("invoiceId");
+		if (userOrderDto.getInvoiceStatus() != null && userOrderDto.getInvoiceStatus() == 2) {
+			orderInfoCriteria.andIsNotNull("invoiceId");
 		}
 		if (userOrderDto.getInvoiceStatus() != null && userOrderDto.getInvoiceStatus() == 1) {
-			orderInfoCriteria.andEqualTo("invoiceStatus", userOrderDto.getInvoiceStatus()).andIsNull("invoiceId");
+			orderInfoCriteria.andIsNull("invoiceId");
 		}
 		if (StringUtils.isNotBlank(userOrderDto.getStartTime()) && StringUtils.isNotBlank(userOrderDto.getEndTime())) {
 			orderInfoCriteria.andBetween("crtTime", userOrderDto.getStartTime(), userOrderDto.getEndTime());
@@ -684,6 +684,12 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 		if (userOrderDto.getNewStatus() != null) {
 			orderInfoCriteria.andEqualTo("status", userOrderDto.getNewStatus());
 		}
+		if (userOrderDto.getAuditStatus() != null && userOrderDto.getAuditStatus() == 1) {
+			orderInfoCriteria.andEqualTo("auditStatus", userOrderDto.getAuditStatus());
+		}
+		if (userOrderDto.getAuditStatus() != null && userOrderDto.getAuditStatus() == 1) {
+			orderInfoCriteria.andEqualTo("auditStatus", userOrderDto.getAuditStatus());
+		}
 		if (StringUtils.isNotBlank(userOrderDto.getKeywords())) {
 			orderInfoCriteria.andLike("realName", "%" + userOrderDto.getKeywords() + "%")
 					.orLike("realName", "%" + userOrderDto.getKeywords() + "%")