Skip to content

R
rs-cloud-platform
Commit 6ebe95b4 authored by unset's avatar unset
Browse files
Options

添加意见反馈添加信息

parent 90077c9e
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/OrderInfoBiz.java
View file @ 6ebe95b4
...@@ -150,9 +150,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> { ...@@ -150,9 +150,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
public ObjectRestResponse getUserOrder(UserOrderDto userOrderDto) { public ObjectRestResponse getUserOrder(UserOrderDto userOrderDto) {
Query query = new Query(userOrderDto); Query query = new Query(userOrderDto);
Example example = new Example(OrderInfo.class); Example example = new Example(OrderInfo.class);
Example orderItemExample = new Example(OrderItem.class);
Example.Criteria orderInfoCriteria = example.createCriteria(); Example.Criteria orderInfoCriteria = example.createCriteria();
Example.Criteria orderItemCriteria = orderItemExample.createCriteria();
if (userOrderDto.getStatus() != null) { if (userOrderDto.getStatus() != null) {
orderInfoCriteria.andEqualTo("status", userOrderDto.getStatus()); orderInfoCriteria.andEqualTo("status", userOrderDto.getStatus());
} }
...@@ -163,10 +161,10 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> { ...@@ -163,10 +161,10 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
orderInfoCriteria.andEqualTo("userId", userOrderDto.getUserId()); orderInfoCriteria.andEqualTo("userId", userOrderDto.getUserId());
} }
if (StringUtils.isNotBlank(userOrderDto.getName())) { if (StringUtils.isNotBlank(userOrderDto.getName())) {
orderItemCriteria.andLike("name", "%" + userOrderDto.getName() + "%"); orderInfoCriteria.andLike("name", "%" + userOrderDto.getName() + "%");
} }
if (StringUtils.isNotBlank(userOrderDto.getStartTime()) && StringUtils.isNotBlank(userOrderDto.getEndTime())) { if (StringUtils.isNotBlank(userOrderDto.getStartTime()) && StringUtils.isNotBlank(userOrderDto.getEndTime())) {
orderItemCriteria.andBetween("crtTime", userOrderDto.getStartTime(), userOrderDto.getEndTime()); orderInfoCriteria.andBetween("crtTime", userOrderDto.getStartTime(), userOrderDto.getEndTime());
} }
orderInfoCriteria.andNotEqualTo("status", -1); orderInfoCriteria.andNotEqualTo("status", -1);
example.orderBy("updTime").desc(); example.orderBy("updTime").desc();
...@@ -643,7 +641,6 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> { ...@@ -643,7 +641,6 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
if (StringUtils.isNotBlank(userOrderDto.getName())) { if (StringUtils.isNotBlank(userOrderDto.getName())) {
orderItemCriteria.andLike("name", "%" + userOrderDto.getName() + "%"); orderItemCriteria.andLike("name", "%" + userOrderDto.getName() + "%");
} }
orderInfoCriteria.andNotEqualTo("status", -1);
example.orderBy("updTime").desc(); example.orderBy("updTime").desc();
PageDataVO<OrderInfo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example)); PageDataVO<OrderInfo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example));
if (pageDataVO != null && pageDataVO.getData() != null && pageDataVO.getData().size() > 0) { if (pageDataVO != null && pageDataVO.getData() != null && pageDataVO.getData().size() > 0) {
......
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