feat: 用户修改,设置用户类型

guzijian
1 parent 9736095f
Showing 5 changed files with 52 additions and 27 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageUserController.java
trash-garbage/src/main/java/com/trash/garbage/global/GlobalStatus.java
trash-garbage/src/main/java/com/trash/garbage/service/GarUserService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
@@ -3,6 +3,7 @@ package com.trash.garbage.controller;
 import com.trash.garbage.global.Result;
 import com.trash.garbage.pojo.domain.GarAddress;
+import com.trash.garbage.pojo.domain.GarUser;
 import com.trash.garbage.pojo.dto.AddressDto;
 import com.trash.garbage.pojo.dto.LoginDto;
 import com.trash.garbage.service.GarUserService;
@@ -67,4 +68,11 @@ public class GarbageUserController {
     }
+    @PutMapping("/update")
+    public Result<?> updateUser(@RequestBody GarUser user){
+        garUserService.updateUserInfo(user);
+        return Result.OK();
+    }
+
+
 }
@@ -36,8 +36,8 @@ public class GlobalStatus {
          * 普通登录
          */
         NORMAL_LOGIN(0, "普通登录"),
-        NORMAL_USER(0, "普通用户"),
-        DRIVER_USER(1, "驾驶员用户");
+        NORMAL_USER(0, "居民用户"),
+        DRIVER_USER(1, "管理负责人");
         private Integer status;
         private String description;
@@ -27,4 +27,6 @@ public interface GarUserService extends IService&lt;GarUser&gt; {
     String updateAddress(AddressDto dto);
     String deleteAddress(String addressId);
+
+    void updateUserInfo(GarUser user);
 }
@@ -90,7 +90,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         driverVo.setPhoneNo(tel);
         driverVo.setCompanyId(Long.valueOf(order.getGarOrderCompanyId()));
         List<DriverVo> driverVos = driverService.selectDriverList(driverVo);
-        if (CollectionUtil.isNotEmpty(driverVos)){
+        if (CollectionUtil.isNotEmpty(driverVos)) {
             vo.setHandleFlag(true);
         }
         List<GarOrderImage> imageList = garOrderImageService.list(qwi);
@@ -112,13 +112,11 @@ 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);
-        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 (user.getGarUserType().equals(GlobalStatus.UserStatusEnum.DRIVER_USER.getDescription())) {
+            PageHelper.startPage(pageNo, pageSize);
             // 待清运 || 清运中 || 已完成 || 待支付
             if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type)
                     || GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
@@ -137,9 +135,12 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 return pageInfo;
             }
         } else {
-
+            DriverVo driver = new DriverVo();
+            driver.setPhoneNo(user.getGarUserTel());
+            List<DriverVo> driverList = driverService.selectDriverList(driver);
             DriverVo driverVo = driverList.get(0);
             String companyId = String.valueOf(driverVo.getCompanyId());
+            PageHelper.startPage(pageNo, pageSize);
             if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type)) {
                 qw.eq(GarOrder::getGarOrderCompanyId, companyId)
                         .eq(GarOrder::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.NEW_ORDER.getValue());
@@ -175,25 +176,28 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         String userId = SecurityUtils.getLoginUser().getUser().getUserId();
         GarUser user = garUserService.getById(userId);
         // 运输员操作 TODO 公司所属 待清运- 》 清运中
-        if (order.getGarOrderHandlerStatus().equals(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue())
-                || GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(dto.getHandleType())) {
-            LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
-            uw.eq(GarOrder::getGarOrderId, dto.getGarOrderId())
-                    .set(GarOrder::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue())
-                    .set(GarOrder::getGarOrderHandlerId, userId);
-            update(uw);
-            return "准备清运";
-        }
-        // 运输员操作 清运中 ==》待支付 TODO
-        if (GlobalStatus.GarOrderStatus.ACTIVE_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);
+        if (GlobalStatus.UserStatusEnum.NORMAL_USER.getDescription().equals(user.getGarUserType())){
+            if (order.getGarOrderHandlerStatus().equals(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue())
+                    || GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(dto.getHandleType())) {
+                LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
+                uw.eq(GarOrder::getGarOrderId, dto.getGarOrderId())
+                        .set(GarOrder::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue())
+                        .set(GarOrder::getGarOrderHandlerId, userId);
+                update(uw);
+                return "准备清运";
+            }
+            // 运输员操作 清运中 ==》已完成
+            if (GlobalStatus.GarOrderStatus.ACTIVE_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 "派单已完成";
         }
-        return "";
+        return "什么都没发生";
     }
     @Override
@@ -206,6 +206,17 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         return "删除成功！";
     }
+    @Override
+    public void updateUserInfo(GarUser user) {
+        String userId = SecurityUtils.getLoginUser().getUser().getUserId();
+        LambdaUpdateWrapper<GarUser> uw = new LambdaUpdateWrapper<>();
+        uw.eq(GarUser::getGarUserId, userId)
+                .set(GarUser::getGarUserType, user.getGarUserType())
+                .set(GarUser::getGarUserName, user.getGarUserName())
+                .set(GarUser::getGarUserCarNum, user.getGarUserCarNum());
+        update(uw);
+    }
+
     /**
      * 微信小程序解密