diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java index 0a99cae2..ade09418 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java @@ -79,19 +79,23 @@ public class WorkOrderServiceImpl implements WorkOrderService { imageMapper.deleteByImageIds(imageIds); } - // 更新处理人 + String phoneList = ""; orderMapper.deleteOrderUserByOrderId(domain.getWorkOrderId()); List orderUserDomainList = new ArrayList<>(); for(XhpcWorkUserDomain userDomain: domain.getUserList()){ XhpcWorkOrderUserDomain orderUserDomain = new XhpcWorkOrderUserDomain(); orderUserDomain.setOrderId(domain.getWorkOrderId()); orderUserDomain.setUserId(userDomain.getWorkUserId()); - orderUserDomainList.add(orderUserDomain); + + phoneList = userDomain.getPhone() + "," + phoneList; } orderMapper.insertOrderUser(orderUserDomainList); + if(StringUtils.isNotEmpty(phoneList) && domain.getStatus() != null && domain.getStatus()==1){ + sendSms(phoneList, domain.getWorkOrderId().toString()); + } return true; } @@ -131,7 +135,6 @@ public class WorkOrderServiceImpl implements WorkOrderService { domain.setUserList(userDomains); } - if(StringUtils.isNotEmpty(domain.getSerialNumber())){ XhpcStationDeviceDomain deviceDomain = deviceMapper.selectStationGunDeviceBySerialNumber(domain.getSerialNumber()); if (deviceDomain == null){ @@ -164,26 +167,10 @@ public class WorkOrderServiceImpl implements WorkOrderService { orderMapper.insertOrderUser(orderUserDomainList); } // todo 发送多人短信 - HashMap paramMap = new HashMap<>(); - paramMap.put("orderNo", domain.getWorkOrderId().toString()); - paramMap.put("phone", phoneList); - paramMap.put("content", "【小华充电】您好,您有新的工单(工单号:"+ domain.getWorkOrderId() +")待处理,请及时登陆后台查看并处理,谢谢。"); - R r = smsService.sendNotice(paramMap); - - XhpcWorkOrderPushMessageDomain messageDomain = new XhpcWorkOrderPushMessageDomain(); - messageDomain.setContent(paramMap.get("content")); - messageDomain.setTarget(phoneList); - messageDomain.setType(Short.valueOf("1")); - if (r!= null && r.getCode() != 200){ - messageDomain.setFailMsg("发送失败"); - messageDomain.setStatus(Short.valueOf("2")); - } else { - messageDomain.setFailMsg("发送成功"); - messageDomain.setStatus(Short.valueOf("1")); + if(StringUtils.isNotEmpty(phoneList) && domain.getStatus() != null && domain.getStatus()==1){ + sendSms(phoneList, domain.getWorkOrderId().toString()); } - - messageMapper.insertSelective(messageDomain); - return true; + return true; } @@ -198,4 +185,26 @@ public class WorkOrderServiceImpl implements WorkOrderService { return true; } + + private void sendSms(String phoneList, String orderId){ + HashMap paramMap = new HashMap<>(); + paramMap.put("orderNo", orderId); + paramMap.put("phone", phoneList); + paramMap.put("content", "【小华充电】您好,您有新的工单(工单号:"+ orderId +")待处理,请及时登陆后台查看并处理,谢谢。"); + R r = smsService.sendNotice(paramMap); + + XhpcWorkOrderPushMessageDomain messageDomain = new XhpcWorkOrderPushMessageDomain(); + messageDomain.setContent(paramMap.get("content")); + messageDomain.setTarget(phoneList); + messageDomain.setType(Short.valueOf("1")); + if (r!= null && r.getCode() != 200){ + messageDomain.setFailMsg("发送失败"); + messageDomain.setStatus(Short.valueOf("2")); + } else { + messageDomain.setFailMsg("发送成功"); + messageDomain.setStatus(Short.valueOf("1")); + } + messageMapper.insertSelective(messageDomain); + } + } diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderMapper.xml index 40b4b321..6a59341e 100644 --- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderMapper.xml +++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderMapper.xml @@ -176,7 +176,14 @@ #{disposalMethod,jdbcType=VARCHAR}, - 1, + + + 1, + + + #{status} + + 0, #{tenantId,jdbcType=VARCHAR},