feat: 新增取消订单，双向评价

guzijian
1 parent 3cd77100
Showing 8 changed files with 92 additions and 57 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/domain/GarOrder.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
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderMapper.xml
@@ -15,10 +15,10 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
-        <dependency>
-            <groupId>com.trash</groupId>
-            <artifactId>trash-common</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.trash</groupId>-->
+<!--            <artifactId>trash-common</artifactId>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.trash</groupId>
             <artifactId>trash-framework</artifactId>
@@ -27,7 +27,7 @@ public class GlobalStatus {
     /**
      * 用户状态管理
      */
-    public enum UserStatusEnum {
+    public enum GarUserStatusEnum {
         /**
          * 微信登录
          */
@@ -50,7 +50,7 @@ public class GlobalStatus {
             return this.description;
         }
-        UserStatusEnum(Integer status, String description) {
+        GarUserStatusEnum(Integer status, String description) {
             this.status = status;
             this.description = description;
         }
@@ -87,13 +87,15 @@ public class GlobalStatus {
         NEW_ORDER(0, "新订单"),
         ACTIVE_ORDER(1, "处理中"),
         ALL_ORDER(2, "全部订单"),
-        SUCCESS_ORDER(3, "待支付订单"),
+        SUCCESS_ORDER(3, "已完成"),
         FAIL_ORDER(9, "订单处理失败"),
         CANCEL_FLAG_NO(0, "未取消订单"),
         CANCEL_FLAG_YES(1, "取消订单"),
         IMAGE_TYPE_CURRENT(0, "现场图片"),
         IMAGE_TYPE_PUT_ON(1, "装车图片"),
         IMAGE_TYPE_PUT_DOWN(2, "卸车图片"),
+        EVALUATE_TYPE_COMPANY(0,"对公司评价"),
+        EVALUATE_TYPE_USER(1,"对用户评价"),
         EVALUATE_ORDER_NO(0,"待评价"),
         EVALUATE_ORDER_YES(1,"已评价");
@@ -44,22 +44,6 @@ public class GarOrder implements Serializable {
 	 */
 	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;
-	}
-
 	/**
      * 订单地址
      */
@@ -150,8 +134,21 @@ public class GarOrder implements Serializable {
     /**
      * 评分标识
      */
-    private Integer garEvaluateFlag;
-    /**
+	private Integer garEvaluateFlag;
+	/**
+	 * 处理人评分标识
+	 */
+	private Integer garHandlerEvaluateFlag;
+
+	public Integer getGarHandlerEvaluateFlag() {
+		return garHandlerEvaluateFlag;
+	}
+
+	public void setGarHandlerEvaluateFlag(Integer garHandlerEvaluateFlag) {
+		this.garHandlerEvaluateFlag = garHandlerEvaluateFlag;
+	}
+
+	/**
      * 原因
      */
     private String garReason;
@@ -370,6 +367,21 @@ public class GarOrder implements Serializable {
 		this.garReason = garReason;
 	}
+	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;
+	}
@@ -14,6 +14,19 @@ public class EvaluateDto {
     @NotBlank(message = "订单id不能为空")
     private String orderId;
     private String content;
+
+	public Integer getEvaluateType() {
+		return evaluateType;
+	}
+
+	public void setEvaluateType(Integer evaluateType) {
+		this.evaluateType = evaluateType;
+	}
+
+	/**
+	 * 评价类型 0对公司 | 1对用户
+	 */
+	private Integer evaluateType;
     @NotNull
     private Integer score;
     private List<String> imageUrls;
@@ -19,7 +19,7 @@ public class OrderDetailVo {
 	private String garOrderHandlerId;
     private Integer garEvaluateFlag;
-	private Boolean garHandleEvaluateFlag;
+	private Boolean garHandlerEvaluateFlag;
 	private String garOrderCarType;
 	/**
@@ -114,12 +114,9 @@ public class OrderDetailVo {
         this.putDownImages = new ArrayList<>();
         this.putOnImages = new ArrayList<>();
         this.handleFlag = false;
-		this.garHandleEvaluateFlag = true;
+		this.garHandlerEvaluateFlag = true;
     }
-	public String getGarOrderHandleId() {
-		return garOrderHandlerId;
-	}
 	public void setGarOrderHandlerId(String garOrderHandlerId) {
 		this.garOrderHandlerId = garOrderHandlerId;
@@ -307,12 +304,12 @@ public class OrderDetailVo {
 		this.handleFlag = handleFlag;
 	}
-	public Boolean getGarHandleEvaluateFlag() {
-		return garHandleEvaluateFlag;
+	public Boolean getGarHandlerEvaluateFlag() {
+		return garHandlerEvaluateFlag;
 	}
-	public void setGarHandleEvaluateFlag(Boolean garHandleEvaluateFlag) {
-		this.garHandleEvaluateFlag = garHandleEvaluateFlag;
+	public void setGarHandlerEvaluateFlag(Boolean garHandlerEvaluateFlag) {
+		this.garHandlerEvaluateFlag = garHandlerEvaluateFlag;
 	}
@@ -90,18 +90,20 @@ 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();
+        GarUser user = garUserService.getById(SecurityUtils.getLoginUser().getUser().getUserId());
         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);
-        List<DriverVo> driverVos = driverService.selectDriverList(driverVo);
-        if (CollectionUtil.isNotEmpty(driverVos)) {
+        List<DriverVo> driverVos = null;
+        if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription())) {
             vo.setHandleFlag(true);
-            vo.setGarHandleEvaluateFlag(false);
+            vo.setGarHandlerEvaluateFlag(false);
+            // 防止其他人员处理订单
+            if (!order.getGarOrderHandlerStatus().equals(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue()) && !order.getGarOrderHandlerId().equals(user.getGarUserId())) {
+                vo.setHandleFlag(false);
+            }
         }
+        BeanUtils.copyBeanProp(vo, order);
         List<GarOrderImage> imageList = garOrderImageService.list(qwi);
         for (GarOrderImage image : imageList) {
             if (GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue().equals(image.getGarOrderImageType())) {
@@ -115,9 +117,13 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             }
         }
         if (StringUtils.isNotEmpty(vo.getGarOrderHandlerId())) {
-            if (vo.getHandleFlag()) {
+            GarUser handleUser = garUserService.getById(vo.getGarOrderHandlerId());
+            DriverVo driverVo = new DriverVo();
+            driverVo.setPhoneNo(handleUser.getGarUserTel());
+            driverVos = driverService.selectDriverList(driverVo);
+            if (CollectionUtil.isNotEmpty(driverVos)) {
                 vo.setGarOrderHandleName(driverVos.get(0).getName());
-                vo.setGarOrderHandleTel(driverVo.getPhoneNo());
+                vo.setGarOrderHandleTel(driverVos.get(0).getPhoneNo());
             }
         }
         return vo;
@@ -128,9 +134,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         String userId = SecurityUtils.getLoginUser().getUser().getUserId();
         GarUser user = garUserService.getById(userId);
         LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<>();
-        qw.orderByAsc(GarOrder::getGarEvaluateFlag, GarOrder::getGarOrderHandlerStatus);
+        qw.orderByAsc(GarOrder::getGarUpdateTime, GarOrder::getGarOrderHandlerStatus);
         // 居民用户
-        if (user.getGarUserType().equals(GlobalStatus.UserStatusEnum.NORMAL_USER.getDescription())) {
+        if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription())) {
             PageHelper.startPage(pageNo, pageSize);
             // 待清运 || 清运中 || 已完成 || 待支付
             if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type)
@@ -169,7 +175,6 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 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, enterprise.getParentId())
@@ -206,14 +211,18 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             update(uw);
             return "订单取消成功";
         }
-        // 运输员操作 TODO 公司所属 待清运- 》 清运中
-        if (GlobalStatus.UserStatusEnum.DRIVER_USER.getDescription().equals(user.getGarUserType())) {
+        // 运输员操作 TODO
+        if (GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription().equals(user.getGarUserType())) {
+            // 公司所属 待清运- 》 清运中
             if (order.getGarOrderHandlerStatus().equals(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue())
                     || GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(dto.getHandleType())) {
+                if (StringUtils.isNotEmpty(order.getGarOrderHandlerId())) {
+                    return "订单已经被别人接受啦";
+                }
                 LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
                 uw.eq(GarOrder::getGarOrderId, dto.getGarOrderId())
                         .set(GarOrder::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue())
-                        .set(GarOrder::getGarOrderHandlerId, userId);
+                        .set(GarOrder::getGarOrderHandlerId, user.getGarUserId());
                 update(uw);
                 return "已接受派单";
             }
@@ -223,6 +232,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
                 uw.eq(GarOrder::getGarOrderId, dto.getGarOrderId())
                         .set(GarOrder::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue())
+                        .set(GarOrder::getGarHandlerEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue())
                         .set(GarOrder::getGarEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue());
                 update(uw);
             }
@@ -250,23 +260,24 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         String userId = SecurityUtils.getLoginUser().getUser().getUserId();
         GarUser user = garUserService.getById(userId);
         GarOrder order = getById(dto.getOrderId());
-        // TODO 用户评价
         if (GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(order.getGarOrderHandlerStatus())) {
-            evaluate(dto, order);
+            evaluate(dto, order, user);
         }
         return "已评价";
     }
-    private void evaluate(EvaluateDto dto, GarOrder order) {
+    private void evaluate(EvaluateDto dto, GarOrder order, GarUser user) {
         GarOrderEvaluate evaluate = new GarOrderEvaluate();
         evaluate.setGarOrderId(order.getGarOrderId());
         evaluate.setGarEvaluateContent(dto.getContent());
         evaluate.setGarEvaluateScore(dto.getScore());
+        evaluate.setGarCompanyId(order.getGarOrderCompanyId());
         garOrderEvaluateService.save(evaluate);
         // 修改订单评价状态
         LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
         uw.eq(GarOrder::getGarOrderId, order.getGarOrderId())
-                .set(GarOrder::getGarEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_YES.getValue());
+                .set(dto.getEvaluateType().equals(GlobalStatus.GarOrderStatus.EVALUATE_TYPE_COMPANY.getValue()), GarOrder::getGarEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_YES.getValue())
+                .set(dto.getEvaluateType().equals(GlobalStatus.GarOrderStatus.EVALUATE_TYPE_USER.getValue()), GarOrder::getGarHandlerEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_YES.getValue());
         update(uw);
     }
 }
@@ -28,7 +28,6 @@ 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.http.HttpRequest;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
@@ -71,7 +70,7 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         if (Objects.isNull(loginDto)) {
             throw new UsernameNotFoundException("当前用户不存在!");
         }
-        if (loginDto.getLoginType().equals(GlobalStatus.UserStatusEnum.WX_LOGIN.getStatus())) {
+        if (loginDto.getLoginType().equals(GlobalStatus.GarUserStatusEnum.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();
             JSONObject open = JSONObject.parseObject(body);
@@ -96,7 +95,7 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
             nUser = new GarUser();
             nUser.setGarUserTel(loginDto.getTel());
             nUser.setGarUserDelFlag(GlobalStatus.DEL_FLAG_NO);
-            nUser.setGarUserType(GlobalStatus.UserStatusEnum.NORMAL_USER.getDescription());
+            nUser.setGarUserType(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription());
             this.save(nUser);
         }
         LoginUser loginUser = new LoginUser();
@@ -26,6 +26,7 @@
         <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="garHandlerEvaluateFlag" column="gar_handler_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>
@@ -38,6 +39,6 @@
         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_order_car_number,gar_order_car_type
+        gar_evaluate_flag,gar_order_car_number,gar_order_car_type,gar_handler_evaluate_flag
     </sql>
 </mapper>