youxiw2000 / trash · Commits

Commit ee9ff6edcb0728948343dcebae2c87e841cf88a5

Authored by guzijian
1 parent 8865ed95
build: skipped

feat: 取消订单设置

Inline Side-by-side
Showing 3 changed files with 32 additions and 5 deletions
trash-garbage/src/main/java/com/trash/garbage/global/GlobalStatus.java
  View file @ee9ff6e
... ... @@ -90,6 +90,7 @@ public class GlobalStatus {
90 90 SUCCESS_ORDER(3, "待支付订单"),
91 91 FAIL_ORDER(9, "订单处理失败"),
92 92 CANCEL_FLAG_NO(0, "未取消订单"),
  93 + CANCEL_FLAG_YES(1, "取消订单"),
93 94 IMAGE_TYPE_CURRENT(0, "现场图片"),
94 95 IMAGE_TYPE_PUT_ON(1, "装车图片"),
95 96 IMAGE_TYPE_PUT_DOWN(2, "卸车图片"),
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderUpdateDto.java
  View file @ee9ff6e
... ... @@ -10,6 +10,14 @@ import java.util.List;
10 10 @Data
11 11 public class OrderUpdateDto {
12 12  
  13 + /**
  14 + * 取消订单
  15 + */
  16 + private Integer garCancelFlag;
  17 +
  18 + private String garReason;
  19 +
  20 +
13 21 /**
14 22 * 订单id
15 23 */
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
  View file @ee9ff6e
1 1 package com.trash.garbage.service.impl;
2 2  
3 3 import java.util.ArrayList;
  4 +import java.util.Collections;
4 5 import java.util.List;
5 6  
6 7 import com.trash.common.utils.StringUtils;
... ... @@ -113,10 +114,11 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder>
113 114 vo.getPutDownImages().add(image.getGarOrderImageUrl());
114 115 }
115 116 }
116   - if (StringUtils.isNotEmpty(vo.getGarOrderHandlerId())){
117   - GarUser handleUser = garUserService.getById(vo.getGarOrderHandleId());
118   - vo.setGarOrderHandleName(handleUser.getGarUserName());
119   - vo.setGarOrderHandleTel(handleUser.getGarUserTel());
  117 + if (StringUtils.isNotEmpty(vo.getGarOrderHandlerId())) {
  118 + if (vo.getHandleFlag()) {
  119 + vo.setGarOrderHandleName(driverVos.get(0).getName());
  120 + vo.setGarOrderHandleTel(driverVo.getPhoneNo());
  121 + }
120 122 }
121 123 return vo;
122 124 }
... ... @@ -135,6 +137,7 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder>
135 137 || GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
136 138 || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
137 139 qw.eq(GarOrder::getGarOrderUserId, userId)
  140 + .eq(GarOrder::getGarCancelFlag, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue())
138 141 .eq(GarOrder::getGarOrderHandlerStatus, type);
139 142 List<GarOrder> orderList = list(qw);
140 143 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
... ... @@ -151,11 +154,16 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
151 154 DriverVo driver = new DriverVo();
152 155 driver.setPhoneNo(user.getGarUserTel());
153 156 List<DriverVo> driverList = driverService.selectDriverList(driver);
  157 + // 负责人不存在
  158 + if (CollectionUtil.isEmpty(driverList)) {
  159 + return new PageInfo<GarOrder>(Collections.emptyList(), pageSize);
  160 + }
154 161 DriverVo driverVo = driverList.get(0);
155 162 TransportationEnterprise enterprise = enterpriseService.selectTransportationEnterpriseById(driverVo.getCompanyId());
156 163 PageHelper.startPage(pageNo, pageSize);
157 164 if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type)) {
158 165 qw.eq(GarOrder::getGarOrderCompanyId, enterprise.getParentId())
  166 + .eq(GarOrder::getGarCancelFlag, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue())
159 167 .eq(GarOrder::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.NEW_ORDER.getValue());
160 168 List<GarOrder> orderList = list(qw);
161 169 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
... ... @@ -166,6 +174,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
166 174 || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
167 175 qw.eq(GarOrder::getGarOrderCompanyId, enterprise.getParentId())
168 176 .eq(GarOrder::getGarOrderHandlerId, user.getGarUserId())
  177 + .eq(GarOrder::getGarCancelFlag, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue())
169 178 .eq(GarOrder::getGarOrderHandlerStatus, type);
170 179 List<GarOrder> orderList = list(qw);
171 180 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
... ... @@ -188,6 +197,15 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
188 197 GarOrder order = getById(dto.getGarOrderId());
189 198 String userId = SecurityUtils.getLoginUser().getUser().getUserId();
190 199 GarUser user = garUserService.getById(userId);
  200 + // 取消订单
  201 + if (GlobalStatus.GarOrderStatus.CANCEL_FLAG_YES.getValue().equals(dto.getGarCancelFlag())) {
  202 + LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
  203 + uw.set(GarOrder::getGarCancelFlag, dto.getGarCancelFlag())
  204 + .set(GarOrder::getGarReason, dto.getGarReason())
  205 + .eq(GarOrder::getGarOrderId, dto.getGarOrderId());
  206 + update(uw);
  207 + return "订单取消成功";
  208 + }
191 209 // 运输员操作 TODO 公司所属 待清运- 》 清运中
192 210 if (GlobalStatus.UserStatusEnum.DRIVER_USER.getDescription().equals(user.getGarUserType())) {
193 211 if (order.getGarOrderHandlerStatus().equals(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue())
... ... @@ -197,7 +215,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
197 215 .set(GarOrder::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue())
198 216 .set(GarOrder::getGarOrderHandlerId, userId);
199 217 update(uw);
200   - return "准备清运";
  218 + return "已接受派单";
201 219 }
202 220 // 运输员操作 清运中 ==》已完成
203 221 if (GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(order.getGarOrderHandlerStatus())
... ...