1

youxiw2000
1 parent db9c5d27
Showing 3 changed files with 24 additions and 10 deletions
trash-garbage/src/main/java/com/trash/garbage/global/GlobalStatus.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
@@ -49,7 +49,8 @@ public class GlobalStatus {
         NORMAL_USER(0, "用户"),
         DISPOSAL_SITE_USER(1, "处置场所负责人"),
         DRIVER_USER(2, "清运车辆驾驶员"),
-        RESPONSIBLE_USER(3, "运输企业负责人");
+        RESPONSIBLE_USER(3, "运输企业负责人"),
+        DROP_SITE_USER(4, "投放点用户");
         private Integer status;
         private String description;
@@ -183,7 +183,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         }
         garOrderImageService.saveBatch(images);
         // TODO 短信提醒 居民下单
-        String content = "【装修垃圾清运】订单提醒：您有新的清运订单" + order.getGarOrderId() + "，请及时处理！用户联系方式" + order.getGarOrderContactTel() + "！";
+        String content = "订单提醒：您有新的清运订单" + order.getGarOrderId() + "，请及时处理！用户联系方式" + order.getGarOrderContactTel() + "！";
         smsUtils.sendMessage(order.getGarOrderCompanyTel(), content);
         return order.getGarOrderId();
     }
@@ -504,9 +504,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         // 完成订单
         GarOrder order = getById(dto.getGarOrderId());
         // TODO 发送短信  通知企业和用户 修改订单状态为完成 disposal 和 handler表的状态一起修改
-        String message = "【装修垃圾清运】订单提醒：您的预约的清运订单" + order.getGarOrderId() + "已完成，可前往【智慧渣管APP】确认并评价，感谢您的使用！";
+        String message = "订单提醒：您的预约的清运订单" + order.getGarOrderId() + "已完成，可前往【智慧渣管APP】确认并评价，感谢您的使用！";
         smsUtils.sendMessage(order.getGarOrderContactTel(), message);
-//        smsUtils.sendMessage(order.getGarOrderCompanyTel(), "【装修垃圾清运】订单提醒：您的预约的清运订单"+order.getGarOrderId()+"已完成，可前往【智慧渣管APP】确认并评价，感谢您的使用！");
+//        smsUtils.sendMessage(order.getGarOrderCompanyTel(), "订单提醒：您的预约的清运订单"+order.getGarOrderId()+"已完成，可前往【智慧渣管APP】确认并评价，感谢您的使用！");
         successOrder(order);
         redisCache.deleteObject(order.getGarOrderId());
         // TODO 用户消息通知 订单菜单消息
@@ -555,7 +555,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】查看！";
+                    "订单提醒：您的待清运订单" + order.getGarOrderId() + "已被取消，详情请登录【智慧渣管APP】查看！" : "订单提醒：您的预约清运订单" + order.getGarOrderId() + "已被取消，详情请登录【智慧渣管APP】查看！";
             smsUtils.sendMessage(tel, message);
             // TODO 用户消息通知 订单菜单消息
             userOrderMessageSend(order, message);
@@ -606,7 +606,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                         .set(GarOrder::getGarOrderCompanyUserId, user.getGarUserId());
                 update(uw);
                 // TODO 短信提醒
-                String message = "【装修垃圾清运】订单提醒：您的预约清运订单" + order.getGarOrderId() + "已被" + order.getGarOrderCompanyName() + "公司接收，详情请登录【智慧渣管APP】查看！企业服务电话！";
+                String message = "订单提醒：您的预约清运订单" + order.getGarOrderId() + "已被" + order.getGarOrderCompanyName() + "公司接收，详情请登录【智慧渣管APP】查看！企业服务电话！";
                 smsUtils.sendMessage(order.getGarOrderContactTel(), message);
                 // TODO 用户消息通知 订单菜单消息
                 userOrderMessageSend(order, message);
@@ -621,8 +621,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(), "【装修垃圾清运】订单提醒：您的预约的清运订单" + order.getGarOrderId() + "已完成，可前往【智慧渣管APP】确认并评价，感谢您的使用！");
-                smsUtils.sendMessage(order.getGarOrderCompanyTel(), "【装修垃圾清运】订单提醒：您的预约的清运订单" + order.getGarOrderId() + "已完成，可前往【智慧渣管APP】确认，感谢您的使用！");
+                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())
@@ -1237,7 +1237,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, "【装修垃圾清运】订单提醒：您有新的清运订单" + order.getGarOrderId() + "，请及时处理！用户联系方式" + order.getGarOrderContactTel());
+        smsUtils.sendMessage(tels, "订单提醒：您有新的清运订单" + order.getGarOrderId() + "，请及时处理！用户联系方式" + order.getGarOrderContactTel());
     }
     private GarOrderMatchHandler getGarOrderMatchHandler(GarOrder order, DispatchDto.DispatchDetail detail) {
@@ -1455,7 +1455,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         List<String> tels = disposalList.stream().map(GarOrderMatchDisposal::getGarOrderDisposalTel).collect(Collectors.toList());
         for (GarOrderMatchHandler garOrderMatchHandler : list) {
-            String content = "【装修垃圾清运】订单提醒：您有新的处置清运订单" + order.getGarOrderId() + "，请联系" + order.getGarOrderCompanyName() + "企业 " + garOrderMatchHandler.getGarOrderHandlerName() + " 驾驶员，驾驶员联系方式" + garOrderMatchHandler.getGarOrderHandlerTel() + "！";
+            String content = "订单提醒：您有新的处置清运订单" + order.getGarOrderId() + "，请联系" + order.getGarOrderCompanyName() + "企业 " + garOrderMatchHandler.getGarOrderHandlerName() + " 驾驶员，驾驶员联系方式" + garOrderMatchHandler.getGarOrderHandlerTel() + "！";
             // TODO 短信通知
             smsUtils.sendMessage(tels, content);
         }
@@ -265,6 +265,16 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
             vo.getRuleVos().add(ruleVo);
         }
+        // 投放点用户
+        if (Objects.nonNull(dropPhone)) {
+            ruleVo = new LoginVo.RuleVo();
+            ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.DROP_SITE_USER.getDescription());
+            nUser.setGarUserType(GlobalStatus.GarUserStatusEnum.DROP_SITE_USER.getDescription());
+            nUser.setGarUserName(list.get(0).getDropPointName());
+            vo.getRuleVos().add(ruleVo);
+
+        }
+        
 //        for (LoginVo.RuleVo r : vo.getRuleVos()){
 //            //排除驾驶员、企业负责人、处理场所
 //            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;
 //            }
 //        }
+              if(vo.getName() == null || vo.getName().isEmpty()){
+            	  nUser.setGarUserName(nUser.getGarUserTel());
+              }
         this.saveOrUpdate(nUser);
         return vo;