From 3870cd5b561d2142061fde581c5ae2f24320c964 Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Fri, 13 May 2022 15:25:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B7=A5=E5=8D=95=E8=BF=90?=
 =?UTF-8?q?=E7=BB=B4=E6=A8=A1=E5=9D=97=E5=AF=B9=E5=B7=A5=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=92=8C=E5=8F=91=E9=80=81=E7=9F=AD=E4=BF=A1=E7=9A=84?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WorkOrderServiceImpl.java    | 53 +++++++++++--------
 .../resources/mapper/XhpcWorkOrderMapper.xml  |  9 +++-
 2 files changed, 39 insertions(+), 23 deletions(-)

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<XhpcWorkOrderUserDomain> 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<String, String> 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<String, String> 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 @@
       <if test="disposalMethod != null">
         #{disposalMethod,jdbcType=VARCHAR},
       </if>
-        1,
+        <choose>
+          <when test="status == null">
+            1,
+          </when>
+        <otherwise>
+          #{status}
+        </otherwise>
+        </choose>
         0,
       <if test="tenantId != null">
         #{tenantId,jdbcType=VARCHAR},