fix: 修改接单公司判断更新，新增退出

guzijian
1 parent b023da3f
Showing 9 changed files with 83 additions and 17 deletions
trash-framework/src/main/java/com/trash/framework/config/SecurityConfig.java
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageUserController.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrder.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.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
trash-garbage/src/main/resources/mapper/GarOrderMapper.xml
@@ -119,7 +119,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/druid/**").anonymous()
                 .antMatchers("/user/login").anonymous()
                 .antMatchers("/user/send/verify").anonymous()
-                .antMatchers("/user/logout").anonymous()
+//                .antMatchers("/user/logout").anonymous()
                 .antMatchers("/system/post/all").anonymous()
                 .antMatchers("/system/user/all").anonymous()
 //                .antMatchers("/workflow/add").anonymous()//测试
@@ -8,9 +8,11 @@ import com.trash.garbage.pojo.dto.AddressDto;
 import com.trash.garbage.pojo.dto.LoginDto;
 import com.trash.garbage.service.GarUserService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpRequest;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 /**
@@ -34,6 +36,17 @@ public class GarbageUserController {
         return Result.OK(garUserService.login(user));
     }
+    /**
+     * 退出登录
+     *
+     * @param
+     * @return
+     */
+    @PostMapping("/logout")
+    public Result<String> logout(HttpServletRequest request) {
+        return Result.OK(garUserService.logout(request));
+    }
+
     @GetMapping("/send/verify")
     public Result<?> sendVerify(@RequestParam("tel") String tel) {
         try {
@@ -69,7 +82,7 @@ public class GarbageUserController {
     @PutMapping("/update")
-    public Result<?> updateUser(@RequestBody GarUser user){
+    public Result<?> updateUser(@RequestBody GarUser user) {
         garUserService.updateUserInfo(user);
         return Result.OK();
     }
@@ -34,7 +34,33 @@ public class GarOrder implements Serializable {
      */
     private String garOrderHandlerId;
-    /**
+	/**
+	 * 车辆数量
+	 */
+	private Integer garOrderCarNumber;
+
+	/**
+	 * 车子类型
+	 */
+	private String garOrderCarType;
+
+	public Integer getGarOrderCarNumber() {
+		return garOrderCarNumber;
+	}
+
+	public void setGarOrderCarNumber(Integer garOrderCarNumber) {
+		this.garOrderCarNumber = garOrderCarNumber;
+	}
+
+	public String getGarOrderCarType() {
+		return garOrderCarType;
+	}
+
+	public void setGarOrderCarType(String garOrderCarType) {
+		this.garOrderCarType = garOrderCarType;
+	}
+
+	/**
      * 订单地址
      */
     private String garOrderAddress;
@@ -345,10 +371,7 @@ public class GarOrder implements Serializable {
 	}
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-    
+
 }
 \ No newline at end of file
 package com.trash.garbage.pojo.dto;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import javax.validation.constraints.NotBlank;
@@ -61,6 +60,16 @@ public class OrderDto {
      */
     private String garOrderCompanyTel;
+	/**
+	 * 车辆数量
+	 */
+	private Integer garOrderCarNumber;
+
+	/**
+	 * 车子类型
+	 */
+	private String garOrderCarType;
+
     /**
      * 约定时间
      */
@@ -17,6 +17,7 @@ public class OrderDetailVo {
     private String garOrderHandlerId;
     private Integer garEvaluateFlag;
+	private Boolean garHandleEvaluateFlag;
     /**
      * 订单地址
      */
@@ -99,6 +100,7 @@ public class OrderDetailVo {
         this.putDownImages = new ArrayList<>();
         this.putOnImages = new ArrayList<>();
         this.handleFlag = false;
+		this.garHandleEvaluateFlag = true;
     }
 	public String getGarOrderHandlerId() {
@@ -6,7 +6,9 @@ import com.trash.garbage.pojo.domain.GarUser;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.trash.garbage.pojo.dto.AddressDto;
 import com.trash.garbage.pojo.dto.LoginDto;
+import org.springframework.http.HttpRequest;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 /**
@@ -29,4 +31,6 @@ public interface GarUserService extends IService&lt;GarUser&gt; {
     String deleteAddress(String addressId);
     void updateUserInfo(GarUser user);
+
+    String logout(HttpServletRequest request);
 }
@@ -3,6 +3,8 @@ package com.trash.garbage.service.impl;
 import java.util.ArrayList;
 import java.util.List;
+import com.trash.enterprise.domain.TransportationEnterprise;
+import com.trash.enterprise.service.ITransportationEnterpriseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -56,6 +58,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     @Autowired
     private IDriverService driverService;
+    @Autowired
+    private ITransportationEnterpriseService enterpriseService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String saveOrder(OrderDto dto) {
@@ -90,10 +95,10 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         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);
+            vo.setGarHandleEvaluateFlag(false);
         }
         List<GarOrderImage> imageList = garOrderImageService.list(qwi);
         for (GarOrderImage image : imageList) {
@@ -116,7 +121,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         GarUser user = garUserService.getById(userId);
         LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<>();
         qw.orderByAsc(GarOrder::getGarEvaluateFlag, GarOrder::getGarOrderHandlerStatus);
-       // 居民用户
+        // 居民用户
         if (user.getGarUserType().equals(GlobalStatus.UserStatusEnum.NORMAL_USER.getDescription())) {
             PageHelper.startPage(pageNo, pageSize);
             // 待清运 || 清运中 || 已完成 || 待支付
@@ -141,10 +146,10 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             driver.setPhoneNo(user.getGarUserTel());
             List<DriverVo> driverList = driverService.selectDriverList(driver);
             DriverVo driverVo = driverList.get(0);
-            String companyId = String.valueOf(driverVo.getCompanyId());
+            TransportationEnterprise enterprise = enterpriseService.selectTransportationEnterpriseById(driverVo.getCompanyId());
             PageHelper.startPage(pageNo, pageSize);
             if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type)) {
-                qw.eq(GarOrder::getGarOrderCompanyId, companyId)
+                qw.eq(GarOrder::getGarOrderCompanyId, enterprise.getParentId())
                         .eq(GarOrder::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.NEW_ORDER.getValue());
                 List<GarOrder> orderList = list(qw);
                 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
@@ -153,7 +158,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             if (GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
                     || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
-                qw.eq(GarOrder::getGarOrderCompanyId, companyId)
+                qw.eq(GarOrder::getGarOrderCompanyId, enterprise.getParentId())
                         .eq(GarOrder::getGarOrderHandlerId, user.getGarUserId())
                         .eq(GarOrder::getGarOrderHandlerStatus, type);
                 List<GarOrder> orderList = list(qw);
@@ -178,7 +183,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         String userId = SecurityUtils.getLoginUser().getUser().getUserId();
         GarUser user = garUserService.getById(userId);
         // 运输员操作 TODO 公司所属 待清运- 》 清运中
-        if (GlobalStatus.UserStatusEnum.DRIVER_USER.getDescription().equals(user.getGarUserType())){
+        if (GlobalStatus.UserStatusEnum.DRIVER_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<>();
@@ -28,7 +28,7 @@ import com.trash.garbage.mapper.GarUserMapper;
 import com.trash.garbage.utils.*;
 import org.apache.commons.codec.binary.Base64;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.http.HttpRequest;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
@@ -38,6 +38,7 @@ import javax.annotation.Resource;
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
+import javax.servlet.http.HttpServletRequest;
 import java.security.spec.AlgorithmParameterSpec;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -70,7 +71,6 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         if (Objects.isNull(loginDto)) {
             throw new UsernameNotFoundException("当前用户不存在!");
         }
-        // TODO 微信登录
         if (loginDto.getLoginType().equals(GlobalStatus.UserStatusEnum.WX_LOGIN.getStatus())) {
             String url = "https://api.weixin.qq.com/sns/jscode2session?appid=" + wxConfig.getAppId() + "&secret=" + wxConfig.getSecret() + "&js_code=" + loginDto.getWxCode() + "&grant_type=authorization_code";
             String body = HttpUtil.createGet(url).header("cache-control", "no-cache").execute().body();
@@ -217,6 +217,13 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         update(uw);
     }
+    @Override
+    public String logout(HttpServletRequest request) {
+        String token = request.getHeader("Authorization");
+        tokenService.delLoginUser(token);
+        return "退出登录";
+    }
+
     /**
      * 微信小程序解密
@@ -26,6 +26,8 @@
         <result property="garReason" column="gar_reason" jdbcType="VARCHAR"/>
         <result property="garCancelFlag" column="gar_cancel_flag" jdbcType="TINYINT"/>
         <result property="garEvaluateFlag" column="gar_evaluate_flag" jdbcType="TINYINT"/>
+        <result property="garOrderCarNumber" column="gar_order_car_number" jdbcType="TINYINT"/>
+        <result property="garOrderCarType" column="gar_order_car_type" jdbcType="TINYINT"/>
     </resultMap>
     <sql id="Base_Column_List">
@@ -35,6 +37,7 @@
         gar_order_trash_type,gar_order_contact_tel,gar_order_company_id,
         gar_order_company_name,gar_order_company_tel,gar_order_hander_status,
         gar_order_agreement_time,gar_create_time,gar_update_time,
-        gar_create_by,gar_update_by,gar_remark,gar_reason,gar_cancel_flag,gar_evaluate_flag
+        gar_create_by,gar_update_by,gar_remark,gar_reason,gar_cancel_flag,
+        gar_evaluate_flag,gar_order_car_number,gar_order_car_type
     </sql>
 </mapper>