瀏覽代碼

feat:新增卸车派单bug

wangweiyu 4 年之前
父節點
當前提交
f755608f98
共有 1 個文件被更改,包括 30 次插入28 次删除
  1. 30 28
      src/main/java/com/aoyang/tms/controller/WorkOrderManageController.java

+ 30 - 28
src/main/java/com/aoyang/tms/controller/WorkOrderManageController.java

@@ -165,7 +165,7 @@ public class WorkOrderManageController {
         Random random = new Random(1000);
         Long timeMillis = System.currentTimeMillis();
         for (String truckId : truckIds) {
-            StringBuffer monbiles = new StringBuffer();
+            List<String> monbiles = new ArrayList<>();
             WorkOrder workOrder = new WorkOrder();
             BeanUtils.copyProperties(orderVO, workOrder);
             workOrder.setTruckId(Long.parseLong(truckId));
@@ -186,7 +186,7 @@ public class WorkOrderManageController {
             if (truckEscort != null) {
                 workOrder.setEscortId(truckEscort.getEscortId());
                 workOrder.setEscortName(truckEscort.getEscortName());
-                monbiles.append("," + truckEscort.getMobile());
+                monbiles.add(truckEscort.getMobile());
             }
             List<TruckDriver> truckDrivers = truckDriverService.findTruckDrivers(truck.getTruckId());
             if (truckDrivers != null && truckDrivers.size() > 0) {
@@ -194,14 +194,14 @@ public class WorkOrderManageController {
                 workOrder.setDriverNameOne(truckDrivers.get(0).getDriverName());
                 User user = commonService.findUser(truckDrivers.get(0).getDriverId());
                 if (user != null) {
-                    monbiles.append("," + user.getMobile());
+                    monbiles.add(user.getMobile());
                 }
                 if (truckDrivers.size() > 1) {
                     workOrder.setDriverIdTwo(truckDrivers.get(1).getDriverId());
                     workOrder.setDriverNameOne(truckDrivers.get(1).getDriverName());
                     User user2 = commonService.findUser(truckDrivers.get(1).getDriverId());
                     if (user2 != null) {
-                        monbiles.append("," + user2.getMobile());
+                        monbiles.add(user2.getMobile());
                     }
                 }
             }
@@ -214,17 +214,18 @@ public class WorkOrderManageController {
 
             workOrders.add(workOrder);
 
-            if (monbiles.length() > 0) {
+            if (monbiles.size() > 0) {
                 // 发送短信
-                SmsSendLog smsSend = new SmsSendLog();
-                smsSend.setType(30);
-                JSONObject content = new JSONObject();
-                content.put("type", "装车");
-                content.put("order_id", orderNo);
-                smsSend.setContent(JSON.toJSONString(content));
-                smsSend.setMobile(monbiles.substring(1));
-                log.info("发送装车运单短信:{}", JSON.toJSONString(smsSend));
-                messageFeign.send(smsSend, null, null, null);
+                for (String mobile : monbiles) {
+                    SmsSendLog smsSend = new SmsSendLog();
+                    smsSend.setType(30);
+                    JSONObject content = new JSONObject();
+                    content.put("type", "装车");
+                    content.put("order_id", orderNo);
+                    smsSend.setContent(JSON.toJSONString(content));
+                    smsSend.setMobile(mobile);
+                    messageFeign.send(smsSend, null, null, null);
+                }
             }
 
         }
@@ -265,7 +266,7 @@ public class WorkOrderManageController {
         Random random = new Random(1000);
         Long timeMillis = System.currentTimeMillis();
         for (String truckId : truckIds) {
-            StringBuffer monbiles = new StringBuffer();
+            List<String> monbiles = new ArrayList<>();
             WorkOrder workOrder = new WorkOrder();
             BeanUtils.copyProperties(orderVO, workOrder);
             workOrder.setSpotId(workSpot.getSpotId());
@@ -288,7 +289,7 @@ public class WorkOrderManageController {
             if (truckEscort != null) {
                 workOrder.setEscortId(truckEscort.getEscortId());
                 workOrder.setEscortName(truckEscort.getEscortName());
-                monbiles.append("," + truckEscort.getMobile());
+                monbiles.add(truckEscort.getMobile());
             }
             List<TruckDriver> truckDrivers = truckDriverService.findTruckDrivers(truck.getTruckId());
             if (truckDrivers != null && truckDrivers.size() > 0) {
@@ -296,14 +297,14 @@ public class WorkOrderManageController {
                 workOrder.setDriverNameOne(truckDrivers.get(0).getDriverName());
                 User user = commonService.findUser(truckDrivers.get(0).getDriverId());
                 if (user != null) {
-                    monbiles.append("," + user.getMobile());
+                    monbiles.add(user.getMobile());
                 }
                 if (truckDrivers.size() > 1) {
                     workOrder.setDriverIdTwo(truckDrivers.get(1).getDriverId());
                     workOrder.setDriverNameOne(truckDrivers.get(1).getDriverName());
                     User user2 = commonService.findUser(truckDrivers.get(1).getDriverId());
                     if (user2 != null) {
-                        monbiles.append("," + user2.getMobile());
+                        monbiles.add(user2.getMobile());
                     }
                 }
             }
@@ -316,17 +317,18 @@ public class WorkOrderManageController {
 
             workOrders.add(workOrder);
 
-            if (monbiles.length() > 0) {
+            if (monbiles.size() > 0) {
                 // 发送短信
-                SmsSendLog smsSend = new SmsSendLog();
-                smsSend.setType(30);
-                JSONObject content = new JSONObject();
-                content.put("type", "卸车");
-                content.put("order_id", orderNo);
-                smsSend.setContent(JSON.toJSONString(content));
-                smsSend.setMobile(monbiles.substring(1));
-                log.info("发送卸车运单短信:{}", JSON.toJSONString(smsSend));
-                messageFeign.send(smsSend, null, null, null);
+                for (String mobile : monbiles) {
+                    SmsSendLog smsSend = new SmsSendLog();
+                    smsSend.setType(30);
+                    JSONObject content = new JSONObject();
+                    content.put("type", "卸车");
+                    content.put("order_id", orderNo);
+                    smsSend.setContent(JSON.toJSONString(content));
+                    smsSend.setMobile(mobile);
+                    messageFeign.send(smsSend, null, null, null);
+                }
             }
         }
         Boolean flag = workOrderService.saveBatch(workOrders);