|
|
|
@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
|
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
|
import com.itmk.web.order.entity.OrderParm;
|
|
|
|
|
import com.itmk.web.order.entity.ParmDetail;
|
|
|
|
|
import com.itmk.web.order.entity.UserOrder;
|
|
|
|
|
import com.itmk.web.order.entity.WxOrderParm;
|
|
|
|
|
import com.itmk.web.order.entity.*;
|
|
|
|
|
import com.itmk.web.order.mapper.UserOrderMapper;
|
|
|
|
|
import com.itmk.web.order.service.UserOrderService;
|
|
|
|
|
import com.itmk.web.order_detail.entity.UserOrderDetail;
|
|
|
|
@ -57,7 +54,8 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderMapper, UserOrder
|
|
|
|
|
//查询条件
|
|
|
|
|
QueryWrapper<UserOrder> query = new QueryWrapper<>();
|
|
|
|
|
query.lambda().eq(UserOrder::getOpenid,parm.getOpenid())
|
|
|
|
|
.eq(StringUtils.isNotEmpty(parm.getType()),UserOrder::getStatus,parm.getType());
|
|
|
|
|
.eq(StringUtils.isNotEmpty(parm.getType()),UserOrder::getStatus,parm.getType())
|
|
|
|
|
.orderByDesc(UserOrder::getCreateTime);
|
|
|
|
|
//构造分页对象
|
|
|
|
|
IPage<UserOrder> page = new Page<>(parm.getCurrentPage(),parm.getPageSize());
|
|
|
|
|
//查询订单主表
|
|
|
|
@ -77,23 +75,40 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderMapper, UserOrder
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public IPage<UserOrder> getPcOrderList(WxOrderParm parm) {
|
|
|
|
|
//查询订单
|
|
|
|
|
//查询条件
|
|
|
|
|
QueryWrapper<UserOrder> query = new QueryWrapper<>();
|
|
|
|
|
query.lambda().like(StringUtils.isNotEmpty(parm.getUserName()),UserOrder::getUserName,parm.getUserName())
|
|
|
|
|
.eq(StringUtils.isNotEmpty(parm.getType()),UserOrder::getStatus,parm.getType())
|
|
|
|
|
query.lambda().eq(StringUtils.isNotEmpty(parm.getType()),UserOrder::getStatus,parm.getType())
|
|
|
|
|
.like(StringUtils.isNotEmpty(parm.getUserName()),UserOrder::getUserName,parm.getUserName())
|
|
|
|
|
.orderByDesc(UserOrder::getCreateTime);
|
|
|
|
|
//构造分页对象
|
|
|
|
|
IPage<UserOrder> page = new Page<>(parm.getCurrentPage(),parm.getPageSize());
|
|
|
|
|
//查询订单主表
|
|
|
|
|
IPage<UserOrder> order = this.baseMapper.selectPage(page, query);
|
|
|
|
|
//有数据,查询子订单
|
|
|
|
|
if(order.getRecords().size()>0){
|
|
|
|
|
for (int i = 0;i<order.getRecords().size();i++){
|
|
|
|
|
//查询子表
|
|
|
|
|
if(order.getRecords().size() > 0){
|
|
|
|
|
for(int i=0;i<order.getRecords().size();i++){
|
|
|
|
|
QueryWrapper<UserOrderDetail> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
queryWrapper.lambda().eq(UserOrderDetail::getOrderId,order.getRecords().get(i).getOrderId());
|
|
|
|
|
List<UserOrderDetail> list = userOrderDetailService.list(queryWrapper);
|
|
|
|
|
//设置订单对应的商品
|
|
|
|
|
order.getRecords().get(i).setGoodsList(list);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
return order;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public List<SunList> getDays() {
|
|
|
|
|
return this.baseMapper.getDays();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public List<SunList> getMonths() {
|
|
|
|
|
return this.baseMapper.getMonths();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public List<SunList> getYears() {
|
|
|
|
|
return this.baseMapper.getYears();
|
|
|
|
|
}
|
|
|
|
|
}
|