feat: 修改状态修改订单获取条件

guzijian
1 parent eb0a9496
Showing 5 changed files with 62 additions and 29 deletions
trash-garbage/pom.xml
trash-garbage/src/main/java/com/trash/garbage/global/GlobalStatus.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/EvaluateDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
@@ -46,6 +46,10 @@
             <artifactId>hutool-all</artifactId>
             <version>5.3.8</version>
         </dependency>
+        <dependency>
+            <groupId>com.trash</groupId>
+            <artifactId>trash-unit</artifactId>
+        </dependency>
     </dependencies>
     <!-- 项目打包时会将java目录中的*.xml文件也进行打包 -->
     <build>
@@ -87,8 +87,7 @@ public class GlobalStatus {
         NEW_ORDER(0, "新订单"),
         ACTIVE_ORDER(1, "处理中"),
         ALL_ORDER(2, "全部订单"),
-        PAY_ORDER(3, "待支付订单"),
-        SUCCESS_ORDER(4, "完成订单"),
+        SUCCESS_ORDER(3, "待支付订单"),
         FAIL_ORDER(9, "订单处理失败"),
         CANCEL_FLAG_NO(0, "未取消订单"),
         IMAGE_TYPE_CURRENT(0, "现场图片"),
@@ -13,7 +13,6 @@ import java.util.List;
 public class EvaluateDto {
     @NotBlank(message = "订单id不能为空")
     private String orderId;
-    private String garCompanyId;
     private String content;
     @NotNull
     private Integer score;
@@ -89,10 +89,16 @@ public class OrderDetailVo {
      */
     private String garRemark;
+    /**
+     * 允许处理标识
+     */
+    private Boolean handleFlag;
+
     public OrderDetailVo(){
         this.currentImages = new ArrayList<>();
         this.putDownImages = new ArrayList<>();
         this.putOnImages = new ArrayList<>();
+        this.handleFlag = false;
     }
 }
 package com.trash.garbage.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -7,6 +8,8 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.bean.BeanUtils;
+import com.trash.driver.domain.vo.DriverVo;
+import com.trash.driver.service.IDriverService;
 import com.trash.garbage.global.GlobalStatus;
 import com.trash.garbage.pojo.domain.GarOrder;
 import com.trash.garbage.pojo.domain.GarOrderEvaluate;
@@ -48,6 +51,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     @Autowired
     private GarUserService garUserService;
+    @Autowired
+    private IDriverService driverService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String saveOrder(OrderDto dto) {
@@ -75,10 +81,18 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     @Override
     public OrderDetailVo queryOrderDetail(String id) {
         GarOrder order = this.getById(id);
+        String tel = SecurityUtils.getLoginUser().getUser().getPhonenumber();
         LambdaQueryWrapper<GarOrderImage> qwi = new LambdaQueryWrapper<>();
         qwi.eq(GarOrderImage::getGarOrderId, id);
         OrderDetailVo vo = new OrderDetailVo();
         BeanUtils.copyBeanProp(vo, order);
+        DriverVo driverVo = new DriverVo();
+        driverVo.setPhoneNo(tel);
+        driverVo.setCompanyId(Long.valueOf(order.getGarOrderCompanyId()));
+        List<DriverVo> driverVos = driverService.selectDriverList(driverVo);
+        if (CollectionUtil.isNotEmpty(driverVos)){
+            vo.setHandleFlag(true);
+        }
         List<GarOrderImage> imageList = garOrderImageService.list(qwi);
         for (GarOrderImage image : imageList) {
             if (GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue().equals(image.getGarOrderImageType())) {
@@ -98,39 +112,60 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     public PageInfo queryOrderList(Integer type, Integer pageNo, Integer pageSize) {
         String userId = SecurityUtils.getLoginUser().getUser().getUserId();
         GarUser user = garUserService.getById(userId);
-        // TODO 区分用户类型
-        // 判断用户类型 普通用户
-        if (GlobalStatus.UserStatusEnum.NORMAL_USER.getDescription().equals(user.getGarUserType())) {
+        DriverVo driver = new DriverVo();
+        driver.setPhoneNo(user.getGarUserTel());
+        List<DriverVo> driverList = driverService.selectDriverList(driver);
+        LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<>();
+        qw.orderByAsc(GarOrder::getGarEvaluateFlag, GarOrder::getGarOrderHandlerStatus);
+        PageHelper.startPage(pageNo, pageSize);
+        if (CollectionUtil.isEmpty(driverList)) {
             // 待清运 || 清运中 || 已完成 || 待支付
             if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type)
                     || GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
-                    || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)
-                    || GlobalStatus.GarOrderStatus.PAY_ORDER.getValue().equals(type)) {
-                LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<>();
+                    || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
                 qw.eq(GarOrder::getGarOrderUserId, userId)
-                        .eq(GarOrder::getGarOrderHandlerStatus, type)
-                        .orderByAsc(GarOrder::getGarEvaluateFlag);
-                PageHelper.startPage(pageNo, pageSize);
+                        .eq(GarOrder::getGarOrderHandlerStatus, type);
                 List<GarOrder> orderList = list(qw);
                 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
                 return pageInfo;
             }
             // 全部
             if (GlobalStatus.GarOrderStatus.ALL_ORDER.getValue().equals(type)) {
-                LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<>();
-                qw.eq(GarOrder::getGarOrderUserId, userId)
-                        .orderByAsc(GarOrder::getGarEvaluateFlag, GarOrder::getGarOrderHandlerStatus);
-                PageHelper.startPage(pageNo, pageSize);
+                qw.eq(GarOrder::getGarOrderUserId, userId);
                 List<GarOrder> orderList = list(qw);
                 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
                 return pageInfo;
             }
-
         } else {
-            // TODO
-        }
+            DriverVo driverVo = driverList.get(0);
+            String companyId = String.valueOf(driverVo.getCompanyId());
+            if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type)) {
+                qw.eq(GarOrder::getGarOrderCompanyId, companyId)
+                        .eq(GarOrder::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.NEW_ORDER.getValue());
+                List<GarOrder> orderList = list(qw);
+                PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
+                return pageInfo;
+            }
+            if (GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
+                    || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
+                qw.eq(GarOrder::getGarOrderCompanyId, companyId)
+                        .eq(GarOrder::getGarOrderHandlerId, user.getGarUserId())
+                        .eq(GarOrder::getGarOrderHandlerStatus, type);
+                List<GarOrder> orderList = list(qw);
+                PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
+                return pageInfo;
+            }
+
+            // 全部
+            if (GlobalStatus.GarOrderStatus.ALL_ORDER.getValue().equals(type)) {
+                qw.eq(GarOrder::getGarOrderHandlerId, userId);
+                List<GarOrder> orderList = list(qw);
+                PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
+                return pageInfo;
+            }
+        }
         return null;
     }
@@ -151,22 +186,12 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         }
         // 运输员操作 清运中 ==》待支付 TODO
         if (GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(order.getGarOrderHandlerStatus())
-                && GlobalStatus.GarOrderStatus.PAY_ORDER.getValue().equals(dto.getHandleType())) {
-            LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
-            uw.eq(GarOrder::getGarOrderId, dto.getGarOrderId())
-                    .set(GarOrder::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.PAY_ORDER.getValue());
-            update(uw);
-        }
-
-        // 用户确认 待支付 ==》已完成
-        if (GlobalStatus.GarOrderStatus.PAY_ORDER.getValue().equals(order.getGarOrderHandlerStatus())
                 && GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(dto.getHandleType())) {
             LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
             uw.eq(GarOrder::getGarOrderId, dto.getGarOrderId())
                     .set(GarOrder::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue())
                     .set(GarOrder::getGarEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue());
             update(uw);
-            // 修改评价状态
         }
         return "";
     }