Merge branch 'dev' of http://101.95.0.106:8888/youxiw20000/trash into dev

youxiw2000
2 parents 72a67ced 3cd77100
Showing 4 changed files with 96 additions and 4 deletions
trash-garbage/src/main/java/com/trash/garbage/global/GlobalStatus.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderUpdateDto.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
@@ -90,6 +90,7 @@ public class GlobalStatus {
         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, "卸车图片"),
@@ -10,6 +10,14 @@ import java.util.List;
 @Data
 public class OrderUpdateDto {
+	/**
+	 * 取消订单
+	 */
+	private Integer garCancelFlag;
+
+	private String garReason;
+
+
     /**
      * 订单id
      */
@@ -3,7 +3,6 @@ package com.trash.garbage.pojo.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import javax.validation.constraints.NotEmpty;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -14,11 +13,25 @@ import java.util.List;
 @Data
 public class OrderDetailVo {
-    private String garOrderHandlerId;
+	private Integer garCancelFlag;
+
+	private String garReason;
+	private String garOrderHandlerId;
     private Integer garEvaluateFlag;
 	private Boolean garHandleEvaluateFlag;
 	private String garOrderCarType;
+
+	/**
+	 * 处理人名
+	 */
+	private String garOrderHandleName;
+
+
+	/**
+	 * 联系方式
+	 */
+	private String garOrderHandleTel;
     /**
      * 订单地址
      */
@@ -104,13 +117,59 @@ public class OrderDetailVo {
 		this.garHandleEvaluateFlag = true;
     }
-	public String getGarOrderHandlerId() {
+	public String getGarOrderHandleId() {
 		return garOrderHandlerId;
 	}
 	public void setGarOrderHandlerId(String garOrderHandlerId) {
 		this.garOrderHandlerId = garOrderHandlerId;
 	}
+	public String getGarOrderHandlerId() {
+		return garOrderHandlerId;
+	}
+
+	public String getGarOrderCarType() {
+		return garOrderCarType;
+	}
+
+	public void setGarOrderCarType(String garOrderCarType) {
+		this.garOrderCarType = garOrderCarType;
+	}
+
+	public String getGarOrderHandleName() {
+		return garOrderHandleName;
+	}
+
+	public void setGarOrderHandleName(String garOrderHandleName) {
+		this.garOrderHandleName = garOrderHandleName;
+	}
+
+	public String getGarOrderHandleTel() {
+		return garOrderHandleTel;
+	}
+
+	public void setGarOrderHandleTel(String garOrderHandleTel) {
+		this.garOrderHandleTel = garOrderHandleTel;
+	}
+
+
+
+	public String getGarReason() {
+		return garReason;
+	}
+
+	public void setGarReason(String garReason) {
+		this.garReason = garReason;
+	}
+
+	public Integer getGarCancelFlag() {
+		return garCancelFlag;
+	}
+
+	public void setGarCancelFlag(Integer garCancelFlag) {
+		this.garCancelFlag = garCancelFlag;
+	}
+
 	public Integer getGarEvaluateFlag() {
 		return garEvaluateFlag;
 package com.trash.garbage.service.impl;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import com.trash.common.utils.StringUtils;
 import com.trash.enterprise.domain.TransportationEnterprise;
 import com.trash.enterprise.service.ITransportationEnterpriseService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -112,6 +114,12 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 vo.getPutDownImages().add(image.getGarOrderImageUrl());
             }
         }
+        if (StringUtils.isNotEmpty(vo.getGarOrderHandlerId())) {
+            if (vo.getHandleFlag()) {
+                vo.setGarOrderHandleName(driverVos.get(0).getName());
+                vo.setGarOrderHandleTel(driverVo.getPhoneNo());
+            }
+        }
         return vo;
     }
@@ -129,6 +137,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                     || 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())
                         .eq(GarOrder::getGarOrderHandlerStatus, type);
                 List<GarOrder> orderList = list(qw);
                 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
@@ -145,11 +154,16 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             DriverVo driver = new DriverVo();
             driver.setPhoneNo(user.getGarUserTel());
             List<DriverVo> driverList = driverService.selectDriverList(driver);
+            // 负责人不存在
+            if (CollectionUtil.isEmpty(driverList)) {
+                return new PageInfo<GarOrder>(Collections.emptyList(), pageSize);
+            }
             DriverVo driverVo = driverList.get(0);
             TransportationEnterprise enterprise = enterpriseService.selectTransportationEnterpriseById(driverVo.getCompanyId());
             PageHelper.startPage(pageNo, pageSize);
             if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type)) {
                 qw.eq(GarOrder::getGarOrderCompanyId, enterprise.getParentId())
+                        .eq(GarOrder::getGarCancelFlag, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue())
                         .eq(GarOrder::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.NEW_ORDER.getValue());
                 List<GarOrder> orderList = list(qw);
                 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
@@ -160,6 +174,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                     || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
                 qw.eq(GarOrder::getGarOrderCompanyId, enterprise.getParentId())
                         .eq(GarOrder::getGarOrderHandlerId, user.getGarUserId())
+                        .eq(GarOrder::getGarCancelFlag, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue())
                         .eq(GarOrder::getGarOrderHandlerStatus, type);
                 List<GarOrder> orderList = list(qw);
                 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
@@ -182,6 +197,15 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         GarOrder order = getById(dto.getGarOrderId());
         String userId = SecurityUtils.getLoginUser().getUser().getUserId();
         GarUser user = garUserService.getById(userId);
+        // 取消订单
+        if (GlobalStatus.GarOrderStatus.CANCEL_FLAG_YES.getValue().equals(dto.getGarCancelFlag())) {
+            LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
+            uw.set(GarOrder::getGarCancelFlag, dto.getGarCancelFlag())
+                    .set(GarOrder::getGarReason, dto.getGarReason())
+                    .eq(GarOrder::getGarOrderId, dto.getGarOrderId());
+            update(uw);
+            return "订单取消成功";
+        }
         // 运输员操作 TODO 公司所属 待清运- 》 清运中
         if (GlobalStatus.UserStatusEnum.DRIVER_USER.getDescription().equals(user.getGarUserType())) {
             if (order.getGarOrderHandlerStatus().equals(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue())
@@ -191,7 +215,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                         .set(GarOrder::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue())
                         .set(GarOrder::getGarOrderHandlerId, userId);
                 update(uw);
-                return "准备清运";
+                return "已接受派单";
             }
             // 运输员操作 清运中 ==》已完成
             if (GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(order.getGarOrderHandlerStatus())