|
@@ -37,6 +37,7 @@ import com.zbkj.common.vo.DateLimitUtilVo;
|
|
|
import com.zbkj.common.vo.LogisticsResultVo;
|
|
|
import com.zbkj.common.vo.MyRecord;
|
|
|
import com.zbkj.service.dao.OrderDao;
|
|
|
+import com.zbkj.service.dao.UserDao;
|
|
|
import com.zbkj.service.service.*;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -155,7 +156,19 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
|
|
|
public PageInfo<Order> getUserOrderList(Integer userId, Integer status, PageParamRequest pageRequest) {
|
|
|
Page<Order> page = PageHelper.startPage(pageRequest.getPage(), pageRequest.getLimit());
|
|
|
LambdaQueryWrapper<Order> lqw = Wrappers.lambdaQuery();
|
|
|
- lqw.eq(Order::getUid, userId);
|
|
|
+ User userInfo = userService.getInfo();
|
|
|
+
|
|
|
+ if (null!=userInfo.getIsAllOrders()&&1==userInfo.getIsAllOrders()){
|
|
|
+ List<Integer> parents= userService.getParentId(userId);
|
|
|
+ if (null!=parents&&parents.size()>0){
|
|
|
+ lqw.in(Order::getUid, parents);
|
|
|
+ }else {
|
|
|
+ lqw.eq(Order::getUid, userId);
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ lqw.eq(Order::getUid, userId);
|
|
|
+ }
|
|
|
+
|
|
|
// lqw.ne(Order::getIsIntegral, 1).or().isNull(Order::getIsIntegral);
|
|
|
lqw.and(i -> i.ne(Order::getIsIntegral, 1).or().isNull(Order::getIsIntegral));
|
|
|
if (status >= 0) {
|