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

2c2c2c
1 parent 8605e79b
Showing 2 changed files with 22 additions and 11 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarCarController.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
@@ -18,7 +18,7 @@ import com.trash.driver.service.IDriverService;
 import com.trash.enterprise.domain.TransportationEnterprise;
 import com.trash.garbage.pojo.dto.GarCarInfoVo;
 import com.trash.garbage.service.GarCarServer;
-import javafx.scene.control.SplitPane;
+//import javafx.scene.controlra.SplitPane;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -158,7 +158,8 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         }
         garOrderImageService.saveBatch(images);
         // TODO 短信提醒 居民下单
-        smsUtils.sendMessage(order.getGarOrderCompanyTel(), "企业收单:您有新的清运订单，请及时查看并处理。");
+        String content = "【装修垃圾清运】订单提醒：您有新的清运订单"+order.getGarOrderId()+"，请及时处理！用户联系方式"+order.getGarOrderContactTel()+"！";
+        smsUtils.sendMessage(order.getGarOrderCompanyTel(), content);
         return order.getGarOrderId();
     }
@@ -445,9 +446,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         // 完成订单
         GarOrder order = getById(dto.getGarOrderId());
         // TODO 发送短信  通知企业和用户 修改订单状态为完成 disposal 和 handler表的状态一起修改
-        String message = "您的清运订单已完成，可前往小程序进行评价，感谢您的使用。";
+        String message = "【装修垃圾清运】订单提醒：您的预约的清运订单"+order.getGarOrderId()+"已完成，可前往【智慧渣管APP】确认并评价，感谢您的使用！";
         smsUtils.sendMessage(order.getGarOrderContactTel(), message);
-        smsUtils.sendMessage(order.getGarOrderCompanyTel(), "您的清运订单已完成，详情可在小程序查看。");
+//        smsUtils.sendMessage(order.getGarOrderCompanyTel(), "【装修垃圾清运】订单提醒：您的预约的清运订单"+order.getGarOrderId()+"已完成，可前往【智慧渣管APP】确认并评价，感谢您的使用！");
         successOrder(order);
         redisCache.deleteObject(order.getGarOrderId());
         // TODO 用户消息通知 订单菜单消息
@@ -496,7 +497,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             String tel = GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription().equals(user.getGarUserType()) ?
                     order.getGarOrderCompanyTel() : order.getGarOrderContactTel();
             String message = GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription().equals(user.getGarUserType()) ?
-                    "您的清运订单已取消，详情可在小程序查看" : "企业拒单";
+                    "【装修垃圾清运】订单提醒：您的待清运订单"+order.getGarOrderId()+"已被取消，详情请登录【智慧渣管APP】查看！" : "【装修垃圾清运】订单提醒：您的预约清运订单"+order.getGarOrderId()+"已被取消，详情请登录【智慧渣管APP】查看！";
             smsUtils.sendMessage(tel, message);
             // TODO 用户消息通知 订单菜单消息
             userOrderMessageSend(order, message);
@@ -547,7 +548,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                         .set(GarOrder::getGarOrderCompanyUserId, user.getGarUserId());
                 update(uw);
                 // TODO 短信提醒
-                String message = "运输公司已接受订单号为 " + order.getGarOrderId() + " 的订单。";
+                String message = "【装修垃圾清运】订单提醒：您的预约清运订单"+order.getGarOrderId()+"已被"+order.getGarOrderCompanyName()+"公司接收，详情请登录【智慧渣管APP】查看！企业服务电话！";
                 smsUtils.sendMessage(order.getGarOrderContactTel(), message);
                 // TODO 用户消息通知 订单菜单消息
                 userOrderMessageSend(order, message);
@@ -562,8 +563,8 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                         .set(GarOrder::getGarHandlerEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue())
                         .set(GarOrder::getGarEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue());
                 update(uw);
-                smsUtils.sendMessage(order.getGarOrderContactTel(), "您的清运订单已完成，可前往小程序进行评价，感谢您的使用");
-                smsUtils.sendMessage(order.getGarOrderCompanyTel(), "您的清运订单已完成，详情可在小程序查看。");
+                smsUtils.sendMessage(order.getGarOrderContactTel(), "【装修垃圾清运】订单提醒：您的预约的清运订单"+order.getGarOrderId()+"已完成，可前往【智慧渣管APP】确认并评价，感谢您的使用！");
+                smsUtils.sendMessage(order.getGarOrderCompanyTel(), "【装修垃圾清运】订单提醒：您的预约的清运订单"+order.getGarOrderId()+"已完成，可前往【智慧渣管APP】确认，感谢您的使用！");
                 // 更新disposal
                 LambdaUpdateWrapper<GarOrderMatchDisposal> uwd = new LambdaUpdateWrapper<>();
                 uwd.eq(GarOrderMatchDisposal::getGarOrderId, dto.getGarOrderId())
@@ -1061,7 +1062,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         handlerService.saveBatch(handlerList);
         List<String> tels = handlerList.stream().map(GarOrderMatchHandler::getGarOrderHandlerTel).collect(Collectors.toList());
         // TODO 短信通知
-        smsUtils.sendMessage(tels, "您有新的清运任务！请打开小程序查看当前任务。");
+        smsUtils.sendMessage(tels, "【装修垃圾清运】订单提醒：您有新的清运订单"+order.getGarOrderId()+"，请及时处理！用户联系方式"+order.getGarOrderContactTel());
     }
     private GarOrderMatchHandler getGarOrderMatchHandler(GarOrder order, DispatchDto.DispatchDetail detail) {
@@ -1137,6 +1138,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 }
             }
             voList = voList.stream().filter(v -> carTypes.contains(v.getContainerVolume())).sorted(Comparator.comparing(DispatchDriverVo::getLicensePlateNumber)).sorted(Comparator.comparing(DispatchDriverVo::getSortValue)).collect(Collectors.toList());
+//            voList = voList.stream().filter(v -> v.getPersonnelInfo()!=null).collect(Collectors.toList());
         }
         return voList;
@@ -1271,9 +1273,18 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             disposalList.add(disposal);
         }
         disposalService.saveBatch(disposalList);
+
+        LambdaQueryWrapper<GarOrderMatchHandler> handlerQw = new LambdaQueryWrapper<>();
+        handlerQw.eq(GarOrderMatchHandler::getGarOrderId, order.getGarOrderId());
+        List<GarOrderMatchHandler> list = handlerService.list(handlerQw);
+
         List<String> tels = disposalList.stream().map(GarOrderMatchDisposal::getGarOrderDisposalTel).collect(Collectors.toList());
-        // TODO 短信通知
-        smsUtils.sendMessage(tels, "您有新的驻场任务！请打开小程序查看驻场任务。");
+        for (GarOrderMatchHandler garOrderMatchHandler : list) {
+            String content = "【装修垃圾清运】订单提醒：您有新的处置清运订单"+order.getGarOrderId()+"，请联系"+order.getGarOrderCompanyName()+"企业 "+garOrderMatchHandler.getGarOrderHandlerName()+" 驾驶员，驾驶员联系方式"+garOrderMatchHandler.getGarOrderHandlerTel()+"！";
+            // TODO 短信通知
+            smsUtils.sendMessage(tels, content);
+        }
+
     }
     private GarOrderMatchDisposal getGarOrderMatchDisposal(GarOrder order, DisposalDispatchDto.DispatchDetail detail) {