youxiw2000 / trash · Commits

Commit ae4b0cd541c4dc92795759738de2f51eecfdec33

Authored by youxiw2000
1 parent db9c5d27
build: skipped

1

Inline Side-by-side
Showing 3 changed files with 24 additions and 10 deletions
trash-garbage/src/main/java/com/trash/garbage/global/GlobalStatus.java
  View file @ae4b0cd
... ... @@ -49,7 +49,8 @@ public class GlobalStatus {
49 49 NORMAL_USER(0, "用户"),
50 50 DISPOSAL_SITE_USER(1, "处置场所负责人"),
51 51 DRIVER_USER(2, "清运车辆驾驶员"),
52   - RESPONSIBLE_USER(3, "运输企业负责人");
  52 + RESPONSIBLE_USER(3, "运输企业负责人"),
  53 + DROP_SITE_USER(4, "投放点用户");
53 54  
54 55 private Integer status;
55 56 private String description;
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
  View file @ae4b0cd
... ... @@ -183,7 +183,7 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder>
183 183 }
184 184 garOrderImageService.saveBatch(images);
185 185 // TODO 短信提醒 居民下单
186   - String content = "【装修垃圾清运】订单提醒：您有新的清运订单" + order.getGarOrderId() + "，请及时处理！用户联系方式" + order.getGarOrderContactTel() + "！";
  186 + String content = "订单提醒：您有新的清运订单" + order.getGarOrderId() + "，请及时处理！用户联系方式" + order.getGarOrderContactTel() + "！";
187 187 smsUtils.sendMessage(order.getGarOrderCompanyTel(), content);
188 188 return order.getGarOrderId();
189 189 }
... ... @@ -504,9 +504,9 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder>
504 504 // 完成订单
505 505 GarOrder order = getById(dto.getGarOrderId());
506 506 // TODO 发送短信 通知企业和用户 修改订单状态为完成 disposal 和 handler表的状态一起修改
507   - String message = "【装修垃圾清运】订单提醒：您的预约的清运订单" + order.getGarOrderId() + "已完成，可前往【智慧渣管APP】确认并评价，感谢您的使用！";
  507 + String message = "订单提醒：您的预约的清运订单" + order.getGarOrderId() + "已完成，可前往【智慧渣管APP】确认并评价，感谢您的使用！";
508 508 smsUtils.sendMessage(order.getGarOrderContactTel(), message);
509   -// smsUtils.sendMessage(order.getGarOrderCompanyTel(), "【装修垃圾清运】订单提醒：您的预约的清运订单"+order.getGarOrderId()+"已完成，可前往【智慧渣管APP】确认并评价，感谢您的使用！");
  509 +// smsUtils.sendMessage(order.getGarOrderCompanyTel(), "订单提醒：您的预约的清运订单"+order.getGarOrderId()+"已完成，可前往【智慧渣管APP】确认并评价，感谢您的使用！");
510 510 successOrder(order);
511 511 redisCache.deleteObject(order.getGarOrderId());
512 512 // TODO 用户消息通知 订单菜单消息
... ... @@ -555,7 +555,7 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder>
555 555 String tel = GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription().equals(user.getGarUserType()) ?
556 556 order.getGarOrderCompanyTel() : order.getGarOrderContactTel();
557 557 String message = GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription().equals(user.getGarUserType()) ?
558   - "【装修垃圾清运】订单提醒：您的待清运订单" + order.getGarOrderId() + "已被取消，详情请登录【智慧渣管APP】查看！" : "【装修垃圾清运】订单提醒：您的预约清运订单" + order.getGarOrderId() + "已被取消，详情请登录【智慧渣管APP】查看！";
  558 + "订单提醒：您的待清运订单" + order.getGarOrderId() + "已被取消，详情请登录【智慧渣管APP】查看！" : "订单提醒：您的预约清运订单" + order.getGarOrderId() + "已被取消，详情请登录【智慧渣管APP】查看！";
559 559 smsUtils.sendMessage(tel, message);
560 560 // TODO 用户消息通知 订单菜单消息
561 561 userOrderMessageSend(order, message);
... ... @@ -606,7 +606,7 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder>
606 606 .set(GarOrder::getGarOrderCompanyUserId, user.getGarUserId());
607 607 update(uw);
608 608 // TODO 短信提醒
609   - String message = "【装修垃圾清运】订单提醒：您的预约清运订单" + order.getGarOrderId() + "已被" + order.getGarOrderCompanyName() + "公司接收，详情请登录【智慧渣管APP】查看！企业服务电话！";
  609 + String message = "订单提醒：您的预约清运订单" + order.getGarOrderId() + "已被" + order.getGarOrderCompanyName() + "公司接收，详情请登录【智慧渣管APP】查看！企业服务电话！";
610 610 smsUtils.sendMessage(order.getGarOrderContactTel(), message);
611 611 // TODO 用户消息通知 订单菜单消息
612 612 userOrderMessageSend(order, message);
... ... @@ -621,8 +621,8 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder>
621 621 .set(GarOrder::getGarHandlerEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue())
622 622 .set(GarOrder::getGarEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue());
623 623 update(uw);
624   - smsUtils.sendMessage(order.getGarOrderContactTel(), "【装修垃圾清运】订单提醒：您的预约的清运订单" + order.getGarOrderId() + "已完成，可前往【智慧渣管APP】确认并评价，感谢您的使用！");
625   - smsUtils.sendMessage(order.getGarOrderCompanyTel(), "【装修垃圾清运】订单提醒：您的预约的清运订单" + order.getGarOrderId() + "已完成，可前往【智慧渣管APP】确认，感谢您的使用！");
  624 + smsUtils.sendMessage(order.getGarOrderContactTel(), "订单提醒：您的预约的清运订单" + order.getGarOrderId() + "已完成，可前往【智慧渣管APP】确认并评价，感谢您的使用！");
  625 + smsUtils.sendMessage(order.getGarOrderCompanyTel(), "订单提醒：您的预约的清运订单" + order.getGarOrderId() + "已完成，可前往【智慧渣管APP】确认，感谢您的使用！");
626 626 // 更新disposal
627 627 LambdaUpdateWrapper<GarOrderMatchDisposal> uwd = new LambdaUpdateWrapper<>();
628 628 uwd.eq(GarOrderMatchDisposal::getGarOrderId, dto.getGarOrderId())
... ... @@ -1237,7 +1237,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
1237 1237 handlerService.saveBatch(handlerList);
1238 1238 List<String> tels = handlerList.stream().map(GarOrderMatchHandler::getGarOrderHandlerTel).collect(Collectors.toList());
1239 1239 // TODO 短信通知
1240   - smsUtils.sendMessage(tels, "【装修垃圾清运】订单提醒：您有新的清运订单" + order.getGarOrderId() + "，请及时处理！用户联系方式" + order.getGarOrderContactTel());
  1240 + smsUtils.sendMessage(tels, "订单提醒：您有新的清运订单" + order.getGarOrderId() + "，请及时处理！用户联系方式" + order.getGarOrderContactTel());
1241 1241 }
1242 1242  
1243 1243 private GarOrderMatchHandler getGarOrderMatchHandler(GarOrder order, DispatchDto.DispatchDetail detail) {
... ... @@ -1455,7 +1455,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
1455 1455  
1456 1456 List<String> tels = disposalList.stream().map(GarOrderMatchDisposal::getGarOrderDisposalTel).collect(Collectors.toList());
1457 1457 for (GarOrderMatchHandler garOrderMatchHandler : list) {
1458   - String content = "【装修垃圾清运】订单提醒：您有新的处置清运订单" + order.getGarOrderId() + "，请联系" + order.getGarOrderCompanyName() + "企业 " + garOrderMatchHandler.getGarOrderHandlerName() + " 驾驶员，驾驶员联系方式" + garOrderMatchHandler.getGarOrderHandlerTel() + "！";
  1458 + String content = "订单提醒：您有新的处置清运订单" + order.getGarOrderId() + "，请联系" + order.getGarOrderCompanyName() + "企业 " + garOrderMatchHandler.getGarOrderHandlerName() + " 驾驶员，驾驶员联系方式" + garOrderMatchHandler.getGarOrderHandlerTel() + "！";
1459 1459 // TODO 短信通知
1460 1460 smsUtils.sendMessage(tels, content);
1461 1461 }
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
  View file @ae4b0cd
... ... @@ -265,6 +265,16 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
265 265 vo.getRuleVos().add(ruleVo);
266 266  
267 267 }
  268 + // 投放点用户
  269 + if (Objects.nonNull(dropPhone)) {
  270 + ruleVo = new LoginVo.RuleVo();
  271 + ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.DROP_SITE_USER.getDescription());
  272 + nUser.setGarUserType(GlobalStatus.GarUserStatusEnum.DROP_SITE_USER.getDescription());
  273 + nUser.setGarUserName(list.get(0).getDropPointName());
  274 + vo.getRuleVos().add(ruleVo);
  275 +
  276 + }
  277 +
268 278 // for (LoginVo.RuleVo r : vo.getRuleVos()){
269 279 // //排除驾驶员、企业负责人、处理场所
270 280 // if(r.getUserType().equals(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription()) || r.getUserType().equals(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription()) || r.getUserType().equals(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription())){
... ... @@ -272,6 +282,9 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
272 282 // }
273 283 // }
274 284  
  285 + if(vo.getName() == null || vo.getName().isEmpty()){
  286 + nUser.setGarUserName(nUser.getGarUserTel());
  287 + }
275 288  
276 289 this.saveOrUpdate(nUser);
277 290 return vo;
... ...