Skip to content

R
rs-cloud-platform
Commit 74a1e7a9 authored by unset's avatar unset
Browse files
Options

添加通知信息

parent 372aad3f
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/OrderInfoBiz.java
View file @ 74a1e7a9
...@@ -669,11 +669,11 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> { ...@@ -669,11 +669,11 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
if (userOrderDto.getSendType() != null) { if (userOrderDto.getSendType() != null) {
orderInfoCriteria.andEqualTo("sendType", userOrderDto.getSendType()); orderInfoCriteria.andEqualTo("sendType", userOrderDto.getSendType());
} }
if (userOrderDto.getInvoiceStatus() != null && userOrderDto.getInvoiceStatus() >= 2) { if (userOrderDto.getInvoiceStatus() != null && userOrderDto.getInvoiceStatus() >= 1) {
orderInfoCriteria.andGreaterThan("invoiceStatus", userOrderDto.getInvoiceStatus()); orderInfoCriteria.andGreaterThan("invoiceStatus", userOrderDto.getInvoiceStatus()).andIsNotNull("invoiceId");
} }
if (userOrderDto.getInvoiceStatus() != null && userOrderDto.getInvoiceStatus() == 1) { if (userOrderDto.getInvoiceStatus() != null && userOrderDto.getInvoiceStatus() == 1) {
orderInfoCriteria.andEqualTo("invoiceStatus", userOrderDto.getInvoiceStatus()); orderInfoCriteria.andEqualTo("invoiceStatus", userOrderDto.getInvoiceStatus()).andIsNull("invoiceId");
} }
if (StringUtils.isNotBlank(userOrderDto.getStartTime()) && StringUtils.isNotBlank(userOrderDto.getEndTime())) { if (StringUtils.isNotBlank(userOrderDto.getStartTime()) && StringUtils.isNotBlank(userOrderDto.getEndTime())) {
orderInfoCriteria.andBetween("crtTime", userOrderDto.getStartTime(), userOrderDto.getEndTime()); orderInfoCriteria.andBetween("crtTime", userOrderDto.getStartTime(), userOrderDto.getEndTime());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment