youxiw2000 / trash · Commits

Commit b825e66ed1fe27317a3b275f929af88b6ab55a26

Authored by 2c2c2c
1 parent 8605e79b
build: skipped

装修垃圾清运 短信内容变更，发送逻辑变更

Inline Side-by-side
Showing 2 changed files with 22 additions and 11 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarCarController.java
  View file @b825e66
... ... @@ -18,7 +18,7 @@ import com.trash.driver.service.IDriverService;
18 18 import com.trash.enterprise.domain.TransportationEnterprise;
19 19 import com.trash.garbage.pojo.dto.GarCarInfoVo;
20 20 import com.trash.garbage.service.GarCarServer;
21   -import javafx.scene.control.SplitPane;
  21 +//import javafx.scene.controlra.SplitPane;
22 22 import lombok.extern.slf4j.Slf4j;
23 23 import org.apache.commons.collections4.CollectionUtils;
24 24 import org.apache.commons.lang3.StringUtils;
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
  View file @b825e66
... ... @@ -158,7 +158,8 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder>
158 158 }
159 159 garOrderImageService.saveBatch(images);
160 160 // TODO 短信提醒 居民下单
161   - smsUtils.sendMessage(order.getGarOrderCompanyTel(), "企业收单:您有新的清运订单，请及时查看并处理。");
  161 + String content = "【装修垃圾清运】订单提醒：您有新的清运订单"+order.getGarOrderId()+"，请及时处理！用户联系方式"+order.getGarOrderContactTel()+"！";
  162 + smsUtils.sendMessage(order.getGarOrderCompanyTel(), content);
162 163 return order.getGarOrderId();
163 164 }
164 165  
... ... @@ -445,9 +446,9 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder>
445 446 // 完成订单
446 447 GarOrder order = getById(dto.getGarOrderId());
447 448 // TODO 发送短信 通知企业和用户 修改订单状态为完成 disposal 和 handler表的状态一起修改
448   - String message = "您的清运订单已完成，可前往小程序进行评价，感谢您的使用。";
  449 + String message = "【装修垃圾清运】订单提醒：您的预约的清运订单"+order.getGarOrderId()+"已完成，可前往【智慧渣管APP】确认并评价，感谢您的使用！";
449 450 smsUtils.sendMessage(order.getGarOrderContactTel(), message);
450   - smsUtils.sendMessage(order.getGarOrderCompanyTel(), "您的清运订单已完成，详情可在小程序查看。");
  451 +// smsUtils.sendMessage(order.getGarOrderCompanyTel(), "【装修垃圾清运】订单提醒：您的预约的清运订单"+order.getGarOrderId()+"已完成，可前往【智慧渣管APP】确认并评价，感谢您的使用！");
451 452 successOrder(order);
452 453 redisCache.deleteObject(order.getGarOrderId());
453 454 // TODO 用户消息通知 订单菜单消息
... ... @@ -496,7 +497,7 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder>
496 497 String tel = GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription().equals(user.getGarUserType()) ?
497 498 order.getGarOrderCompanyTel() : order.getGarOrderContactTel();
498 499 String message = GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription().equals(user.getGarUserType()) ?
499   - "您的清运订单已取消，详情可在小程序查看" : "企业拒单";
  500 + "【装修垃圾清运】订单提醒：您的待清运订单"+order.getGarOrderId()+"已被取消，详情请登录【智慧渣管APP】查看！" : "【装修垃圾清运】订单提醒：您的预约清运订单"+order.getGarOrderId()+"已被取消，详情请登录【智慧渣管APP】查看！";
500 501 smsUtils.sendMessage(tel, message);
501 502 // TODO 用户消息通知 订单菜单消息
502 503 userOrderMessageSend(order, message);
... ... @@ -547,7 +548,7 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder>
547 548 .set(GarOrder::getGarOrderCompanyUserId, user.getGarUserId());
548 549 update(uw);
549 550 // TODO 短信提醒
550   - String message = "运输公司已接受订单号为 " + order.getGarOrderId() + " 的订单。";
  551 + String message = "【装修垃圾清运】订单提醒：您的预约清运订单"+order.getGarOrderId()+"已被"+order.getGarOrderCompanyName()+"公司接收，详情请登录【智慧渣管APP】查看！企业服务电话！";
551 552 smsUtils.sendMessage(order.getGarOrderContactTel(), message);
552 553 // TODO 用户消息通知 订单菜单消息
553 554 userOrderMessageSend(order, message);
... ... @@ -562,8 +563,8 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder>
562 563 .set(GarOrder::getGarHandlerEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue())
563 564 .set(GarOrder::getGarEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue());
564 565 update(uw);
565   - smsUtils.sendMessage(order.getGarOrderContactTel(), "您的清运订单已完成，可前往小程序进行评价，感谢您的使用");
566   - smsUtils.sendMessage(order.getGarOrderCompanyTel(), "您的清运订单已完成，详情可在小程序查看。");
  566 + smsUtils.sendMessage(order.getGarOrderContactTel(), "【装修垃圾清运】订单提醒：您的预约的清运订单"+order.getGarOrderId()+"已完成，可前往【智慧渣管APP】确认并评价，感谢您的使用！");
  567 + smsUtils.sendMessage(order.getGarOrderCompanyTel(), "【装修垃圾清运】订单提醒：您的预约的清运订单"+order.getGarOrderId()+"已完成，可前往【智慧渣管APP】确认，感谢您的使用！");
567 568 // 更新disposal
568 569 LambdaUpdateWrapper<GarOrderMatchDisposal> uwd = new LambdaUpdateWrapper<>();
569 570 uwd.eq(GarOrderMatchDisposal::getGarOrderId, dto.getGarOrderId())
... ... @@ -1061,7 +1062,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
1061 1062 handlerService.saveBatch(handlerList);
1062 1063 List<String> tels = handlerList.stream().map(GarOrderMatchHandler::getGarOrderHandlerTel).collect(Collectors.toList());
1063 1064 // TODO 短信通知
1064   - smsUtils.sendMessage(tels, "您有新的清运任务！请打开小程序查看当前任务。");
  1065 + smsUtils.sendMessage(tels, "【装修垃圾清运】订单提醒：您有新的清运订单"+order.getGarOrderId()+"，请及时处理！用户联系方式"+order.getGarOrderContactTel());
1065 1066 }
1066 1067  
1067 1068 private GarOrderMatchHandler getGarOrderMatchHandler(GarOrder order, DispatchDto.DispatchDetail detail) {
... ... @@ -1137,6 +1138,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
1137 1138 }
1138 1139 }
1139 1140 voList = voList.stream().filter(v -> carTypes.contains(v.getContainerVolume())).sorted(Comparator.comparing(DispatchDriverVo::getLicensePlateNumber)).sorted(Comparator.comparing(DispatchDriverVo::getSortValue)).collect(Collectors.toList());
  1141 +// voList = voList.stream().filter(v -> v.getPersonnelInfo()!=null).collect(Collectors.toList());
1140 1142 }
1141 1143  
1142 1144 return voList;
... ... @@ -1271,9 +1273,18 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
1271 1273 disposalList.add(disposal);
1272 1274 }
1273 1275 disposalService.saveBatch(disposalList);
  1276 +
  1277 + LambdaQueryWrapper<GarOrderMatchHandler> handlerQw = new LambdaQueryWrapper<>();
  1278 + handlerQw.eq(GarOrderMatchHandler::getGarOrderId, order.getGarOrderId());
  1279 + List<GarOrderMatchHandler> list = handlerService.list(handlerQw);
  1280 +
1274 1281 List<String> tels = disposalList.stream().map(GarOrderMatchDisposal::getGarOrderDisposalTel).collect(Collectors.toList());
1275   - // TODO 短信通知
1276   - smsUtils.sendMessage(tels, "您有新的驻场任务！请打开小程序查看驻场任务。");
  1282 + for (GarOrderMatchHandler garOrderMatchHandler : list) {
  1283 + String content = "【装修垃圾清运】订单提醒：您有新的处置清运订单"+order.getGarOrderId()+"，请联系"+order.getGarOrderCompanyName()+"企业 "+garOrderMatchHandler.getGarOrderHandlerName()+" 驾驶员，驾驶员联系方式"+garOrderMatchHandler.getGarOrderHandlerTel()+"！";
  1284 + // TODO 短信通知
  1285 + smsUtils.sendMessage(tels, content);
  1286 + }
  1287 +
1277 1288 }
1278 1289  
1279 1290 private GarOrderMatchDisposal getGarOrderMatchDisposal(GarOrder order, DisposalDispatchDto.DispatchDetail detail) {
... ...