feat: 小菜单处理

guzijian
1 parent b6006397
Showing 11 changed files with 181 additions and 60 deletions
trash-admin/src/main/resources/static/role/company.png
trash-admin/src/main/resources/static/role/disposal.png
trash-admin/src/main/resources/static/role/handler.png
trash-admin/src/main/resources/static/role/user.png
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
trash-garbage/src/main/java/com/trash/garbage/global/GlobalStatus.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMapper.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/MyBargeVo.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderMapper.xml
@@ -130,8 +130,10 @@ public class GarbageOrderController {
     }
     @GetMapping("/query/list")
-    public Result<?> queryOrderList(@RequestParam("type") Integer type, @RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize) {
-        return Result.OK(garOrderService.queryOrderList(type, pageNo, pageSize));
+    public Result<?> queryOrderList(@RequestParam("type") Integer type,
+                                    @RequestParam(value = "evaluateFlag", required = false) Integer evaluateFlag,
+                                    @RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize) {
+        return Result.OK(garOrderService.queryOrderList(type, evaluateFlag, pageNo, pageSize));
     }
     @PutMapping("/dispatch")
@@ -205,6 +207,10 @@ public class GarbageOrderController {
         return Result.OK(garOrderService.querySearchHistory());
     }
+    @GetMapping("/queryBadgeByType/{type}")
+    public Result<?> queryBadgeByType(@PathVariable("type")Integer type) {
+        return Result.OK(garOrderService.queryBadgeByType(type));
+    }
     protected void startPage() {
         PageDomain pageDomain = TableSupport.buildPageRequest();
@@ -14,9 +14,13 @@ public class GlobalStatus {
      * 已注销
      */
     public static final int DEL_FLAG_YES = 1;
-    /** 订单超时 */
+    /**
+     * 订单超时
+     */
     public static final boolean ORDER_TIME_OUT_FLAG_YES = true;
-    /** 订单未超时 */
+    /**
+     * 订单未超时
+     */
     public static final boolean ORDER_TIME_OUT_FLAG_NO = false;
     /**
@@ -92,30 +96,30 @@ public class GlobalStatus {
      * 订单
      */
     public enum GarOrderStatus {
-        ORDER_TIME_OUT_FLAG_YES(1,"已超时"),
-        ORDER_TIME_OUT_FLAG_NO(0,"未超时"),
+        ORDER_TIME_OUT_FLAG_YES(1, "已超时"),
+        ORDER_TIME_OUT_FLAG_NO(0, "未超时"),
         NEW_ORDER(0, "新订单"),
         ACTIVE_ORDER(1, "处理中"),
         ALL_ORDER(2, "全部订单"),
         SUCCESS_ORDER(3, "已完成"),
         FAIL_ORDER(9, "订单处理失败"),
-        SCAN_HANDLER_NO(0,"未扫码处理"),
-        SCAN_HANDLER_YES(1,"已扫码处理"),
-        DISPATCH_HANDLE_NEW(0,"未接受"),
-        DISPATCH_HANDLE_ACTIVE(1,"已接受"),
-        DISPATCH_HANDLE_SUCCESS(3,"已完成"),
-        PLAN_CAR_TYPE(0,"预计车辆"),
-        REAL_CAR_TYPE(1,"实际车辆"),
+        SCAN_HANDLER_NO(0, "未扫码处理"),
+        SCAN_HANDLER_YES(1, "已扫码处理"),
+        DISPATCH_HANDLE_NEW(0, "未接受"),
+        DISPATCH_HANDLE_ACTIVE(1, "已接受"),
+        DISPATCH_HANDLE_SUCCESS(3, "已完成"),
+        PLAN_CAR_TYPE(0, "预计车辆"),
+        REAL_CAR_TYPE(1, "实际车辆"),
         CANCEL_FLAG_NO(0, "未取消订单"),
         CANCEL_FLAG_YES(1, "取消订单"),
         IMAGE_TYPE_CURRENT(0, "现场图片"),
         IMAGE_TYPE_PUT_ON(1, "装车图片"),
         IMAGE_TYPE_PUT_DOWN(2, "卸车图片"),
         IMAGE_TYPE_FILL_CAR(3, "全景图片"),
-        EVALUATE_TYPE_COMPANY(0,"对公司评价"),
-        EVALUATE_TYPE_USER(1,"对用户评价"),
-        EVALUATE_ORDER_NO(0,"待评价"),
-        EVALUATE_ORDER_YES(1,"已评价");
+        EVALUATE_TYPE_COMPANY(0, "对公司评价"),
+        EVALUATE_TYPE_USER(1, "对用户评价"),
+        EVALUATE_ORDER_NO(0, "待评价"),
+        EVALUATE_ORDER_YES(1, "已评价");
         GarOrderStatus(Integer status, String description) {
             this.status = status;
@@ -132,6 +136,8 @@ public class GlobalStatus {
         public String getDescription() {
             return this.description;
         }
+
+
     }
 }
@@ -33,6 +33,10 @@ public interface GarOrderMapper extends BaseMapper&lt;GarOrder&gt; {
     List<GarOrder> queryUnprocessedOrder(@Param("orderType")Integer orderType,@Param("timeOutFlag")Integer timeOutFlag,@Param("cancelFlag")Integer cancelFlag);
     void updateTimeOutOrderStatus(@Param("list") List<GarOrder> timeOutList, @Param("status")Integer status,@Param("timeOutFlag") Integer timeOutFlag);
+
+    Integer queryDriverOrderListByTelWithTypeCount(@Param("garUserTel") String garUserTel, @Param("type") Integer type, @Param("cancelFlag") Integer cancelFlag);
+
+    Integer queryDisposalOrderListByTelWithTypeCount(@Param("garUserTel") String garUserTel, @Param("type") Integer type, @Param("cancelFlag") Integer value);
 }
+package com.trash.garbage.pojo.vo;
+
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@ToString
+@EqualsAndHashCode
+public class MyBargeVo {
+    private Integer type;
+    private Integer badge;
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Integer getBadge() {
+        return badge;
+    }
+
+    public void setBadge(Integer badge) {
+        this.badge = badge;
+    }
+}
@@ -36,11 +36,12 @@ public interface GarOrderService extends IService&lt;GarOrder&gt; {
      * 根据类型查询订单
      *
      * @param type
+     * @param evaluateFlag
      * @param pageNo
      * @param pageSize
      * @return
      */
-    PageInfo queryOrderList(Integer type, Integer pageNo, Integer pageSize);
+    PageInfo queryOrderList(Integer type, Integer evaluateFlag, Integer pageNo, Integer pageSize);
     /**
      * 修改订单状态
@@ -99,4 +100,6 @@ public interface GarOrderService extends IService&lt;GarOrder&gt; {
     List<GarOrder> queryUnprocessedOrder(Integer value, Integer orderTimeOutFlagNo, Integer value1);
     void updateTimeOutOrderStatus(List<GarOrder> timeOutList);
+
+    MyBargeVo queryBadgeByType(Integer type);
 }
@@ -203,21 +203,25 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     }
     @Override
-    public PageInfo queryOrderList(Integer type, Integer pageNo, Integer pageSize) {
+    public PageInfo queryOrderList(Integer type, Integer evaluateFlag, Integer pageNo, Integer pageSize) {
         String userId = SecurityUtils.getLoginUser().getUser().getUserId();
         GarUser user = garUserService.getById(userId);
         // 用户
         if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription())) {
             LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<>();
             qw.orderByDesc(GarOrder::getGarCreateTime, GarOrder::getGarOrderHandlerStatus);
+            qw.eq(GarOrder::getGarOrderUserId, userId);
             PageHelper.startPage(pageNo, pageSize);
-            // 待清运 || 清运中 || 已完成 || 待支付
+            // 待清运 || 清运中 || 已完成 || 待评价
             if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type)
                     || GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
                     || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
-                qw.eq(GarOrder::getGarOrderUserId, userId)
-                        .eq(GarOrder::getGarCancelFlag, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue())
+                qw.eq(GarOrder::getGarCancelFlag, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue())
                         .eq(GarOrder::getGarOrderHandlerStatus, type);
+                if (evaluateFlag != null) {
+                    qw.eq(GarOrder::getGarEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue())
+                            .eq(GarOrder::getGarTimeOutFlag, GlobalStatus.GarOrderStatus.ORDER_TIME_OUT_FLAG_NO.getValue());
+                }
                 List<GarOrder> orderList = list(qw);
                 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
                 return pageInfo;
@@ -225,7 +229,6 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             // 全部
             if (GlobalStatus.GarOrderStatus.ALL_ORDER.getValue().equals(type)) {
-                qw.eq(GarOrder::getGarOrderUserId, userId);
                 List<GarOrder> orderList = list(qw);
                 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
                 return pageInfo;
@@ -251,20 +254,29 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         // 企业负责人
         else if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription())) {
             PageHelper.startPage(pageNo, pageSize);
-            LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<GarOrder>();
-            qw.eq(GarOrder::getGarOrderCompanyTel, user.getGarUserTel())
-                    .orderByDesc(GarOrder::getGarOrderAgreementTime);
+            LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<>();
+            qw.orderByDesc(GarOrder::getGarCreateTime, GarOrder::getGarOrderHandlerStatus);
+            qw.eq(GarOrder::getGarOrderCompanyTel, user.getGarUserTel());
+            // 待清运 || 清运中 || 已完成 || 待评价
+            if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type)
+                    || GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
+                    || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
+                qw.eq(GarOrder::getGarCancelFlag, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue())
+                        .eq(GarOrder::getGarOrderHandlerStatus, type);
+                if (evaluateFlag != null) {
+                    qw.eq(GarOrder::getGarHandlerEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue())
+                            .eq(GarOrder::getGarTimeOutFlag, GlobalStatus.GarOrderStatus.ORDER_TIME_OUT_FLAG_NO.getValue());
+                }
+                List<GarOrder> orderList = list(qw);
+                PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
+                return pageInfo;
+            }
             // 全部
             if (GlobalStatus.GarOrderStatus.ALL_ORDER.getValue().equals(type)) {
                 List<GarOrder> orderList = baseMapper.selectList(qw);
                 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
                 return pageInfo;
             }
-            qw.eq(GarOrder::getGarOrderHandlerStatus, type)
-                    .eq(GarOrder::getGarCancelFlag, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
-            List<GarOrder> orderList = baseMapper.selectList(qw);
-            PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
-            return pageInfo;
         }
         // 处置场所
         else if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription())) {
@@ -480,35 +492,6 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         return "已评价";
     }
-    public static void main(String[] args) {
-        System.out.println(convert("PAYPALISHIRING", 3));
-    }
-
-    public static String convert(String s, int numRows) {
-        if (numRows == 1) {
-            return s;
-        }
-        List<StringBuilder> list = new ArrayList<>(numRows);
-        for (int i = 0; i < numRows; i++) {
-            list.add(new StringBuilder());
-        }
-        int space = 1;
-        int x = -1;
-        // 0 1 2 - 2 1 0 - 0 1 2    ||    0 1 2 3 2 1 0 1 2 3  || 0 1 2 3 4 5 6 7 8 9
-        for (int i = 0; i < s.length(); i++) {
-            space = space + x;
-            list.get(space).append(s.charAt(i));
-            if (i % (numRows - 1) == 0) {
-                x = -x;
-            }
-        }
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < numRows; i++) {
-            sb.append(list.get(i));
-        }
-        return sb.toString();
-    }
-
     @Override
     public List<GarOrder> queryOrderListByGarOrder(GarOrder garOrder) {
         LambdaQueryWrapper<GarOrder> qw = createQueryWrapper(garOrder);
@@ -969,6 +952,68 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         }
     }
+    @Override
+    public MyBargeVo queryBadgeByType(Integer type) {
+        GarUser user = garUserService.getById(SecurityUtils.getLoginUser().getUser().getUserId());
+        MyBargeVo vo = new MyBargeVo();
+        // 用户
+        if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription())) {
+            if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type)
+                    || GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
+                    || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
+                LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<>();
+                qw.eq(GarOrder::getGarOrderUserId, user.getGarUserId())
+                        .eq(GarOrder::getGarOrderHandlerStatus, type)
+                        .eq(GarOrder::getGarCancelFlag, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
+                if (GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
+                    qw.eq(GarOrder::getGarEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue())
+                            .eq(GarOrder::getGarTimeOutFlag, GlobalStatus.GarOrderStatus.ORDER_TIME_OUT_FLAG_NO.getValue());
+                }
+                int badge = count(qw);
+                vo.setBadge(badge);
+                vo.setType(type);
+            }
+        }
+        // 运输企业
+        else if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription())) {
+            if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type)
+                    || GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
+                    || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
+                LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<>();
+                qw.eq(GarOrder::getGarOrderCompanyTel, user.getGarUserTel())
+                        .eq(GarOrder::getGarOrderHandlerStatus, type)
+                        .eq(GarOrder::getGarCancelFlag, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
+                if (GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
+                    qw.eq(GarOrder::getGarHandlerEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue())
+                            .eq(GarOrder::getGarTimeOutFlag, GlobalStatus.GarOrderStatus.ORDER_TIME_OUT_FLAG_NO.getValue());
+                }
+                int badge = count(qw);
+                vo.setBadge(badge);
+                vo.setType(type);
+            }
+        }
+        // 驾驶员
+        else if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription())) {
+            if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type)
+                    || GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
+                    || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
+                Integer badge = baseMapper.queryDriverOrderListByTelWithTypeCount(user.getGarUserTel(), type, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
+                vo.setBadge(badge);
+                vo.setType(type);
+            }
+        }
+        // 处理场所
+        else if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription())) {
+            if (GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
+                    || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
+                Integer badge = baseMapper.queryDisposalOrderListByTelWithTypeCount(user.getGarUserTel(), type, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
+                vo.setType(type);
+                vo.setBadge(badge);
+            }
+        }
+        return vo;
+    }
+
     private void handleCleanNumber(TransportationEnterpriseVo vo, List<GarOrder> orderList) {
         Long cleanNumber = 0L;
         for (GarOrder order : orderList) {
@@ -221,4 +221,34 @@
         from gar_order
         where gar_order.gar_order_handler_status = #{orderType} and gar_order.gar_time_out_flag = #{timeOutFlag} and gar_order.gar_cancel_flag = #{cancelFlag}
     </select>
+    <select id="queryDriverOrderListByTelWithTypeCount" resultType="java.lang.Integer">
+        SELECT
+            count(*)
+        FROM gar_order `order`
+        INNER JOIN gar_order_match_handler `handler` ON `order`.gar_order_id = `handler`.gar_order_id
+        <where>
+            `handler`.gar_order_handler_tel = #{garUserTel}
+            <if test="type != null">
+                AND `handler`.gar_order_handler_status = #{type}
+            </if>
+            <if test="cancelFlag != null">
+                AND `handler`.gar_cancel_flag = #{cancelFlag}
+            </if>
+        </where>
+        order by `order`.gar_order_agreement_time desc
+    </select>
+    <select id="queryDisposalOrderListByTelWithTypeCount" resultType="java.lang.Integer">
+        SELECT
+        count(*)
+        FROM
+        gar_order `order`
+        INNER JOIN gar_order_match_disposal `disposal` ON `order`.gar_order_id = `disposal`.gar_order_id
+        <where>
+            `disposal`.gar_order_disposal_tel = #{garUserTel}
+            <if test="type != null">
+                AND `disposal`.gar_order_disposal_status = #{type}
+            </if>
+        </where>
+        order by `disposal`.gar_create_time desc
+    </select>
 </mapper>