发送短信改造

src/main/java/com/steerinfo/dil/service/impl/TmstruckLeaveFactoryResultServiceImpl.java

@@ -389,7 +389,10 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                                 String materialNumber =  dateMap.get("materialNumber") == null ? "" : dateMap.get("materialNumber").toString();
                                 message = message + materialSpe + "("+ materialModel +")" + materialNumber + "件" + "、";
                             }
-                            tmstruckSmsRusultService.generaSendMessageNew(mobile,capacityNum,orderId,message.substring(0, message.length()-1));
+                            String province = messageMap.get("province") == null ? "" : messageMap.get("province").toString();
+                            String district = messageMap.get("district") == null ? "" : messageMap.get("district").toString();
+                            String deliveryAddress = messageMap.get("deliveryAddress") == null ? "" : messageMap.get("deliveryAddress").toString();
+                            tmstruckSmsRusultService.generaSendMessageNew(mobile,capacityNum,orderId,message.substring(0, message.length()-1), province + district + deliveryAddress);
                     }
                     // 调用结算
                 }catch (Exception ex){

src/main/java/com/steerinfo/dil/service/impl/TmstruckSmsRusultServiceImpl.java

@@ -93,13 +93,13 @@ public class TmstruckSmsRusultServiceImpl  implements ITmstruckSmsRusultService
         }
     }
 
-    public int generaSendMessageNew(String mobile,String capacityNum,BigDecimal orderId, String message) throws Exception {
+    public int generaSendMessageNew(String mobile,String capacityNum,BigDecimal orderId, String message, String deliveryAddress) throws Exception {
         String url = "http://www.btom.cn:8080/simpleinter/sendSMS?appId=EUCP-EMY-SMS1-2G25B&";
         String tmpTmp = MD5Util.formatTimeTmp();
         String sign = MD5Util.sign("EUCP-EMY-SMS1-2G25B","960ABC95153C60F0");
         String driverTel = tmstruckSmsRusultMapper.getDriverTel(orderId);
         String mobile1 = Pattern.compile("[^0-9]").matcher(mobile).replaceAll("");
-        String content ="【达州钢铁】尊敬的用户，您在我公司采购的钢材，规格:" + message + "，车牌号:" + capacityNum + "，司机电话:" + driverTel + "，车辆已出厂配送中，欲知详情，请前往达州钢铁智慧物流平台查看车辆实际轨迹。";
+        String content ="【达州钢铁】尊敬的用户，您在我公司采购的钢材，规格:" + message + "，车牌号:" + capacityNum + "，司机电话:" + driverTel + "，收货地址："+ deliveryAddress +"。车辆已出厂配送中，欲知详情，请前往达州钢铁智慧物流平台查看车辆实际轨迹。";
         String sendUrl = url+"timestamp=" + tmpTmp + "&sign=" + sign + "&mobiles=" + mobile1 + "&content=" + content;
         System.out.println(mobile1);
         String jsonData;
@@ -129,7 +129,7 @@ public class TmstruckSmsRusultServiceImpl  implements ITmstruckSmsRusultService
         String mobile1 = mobile;
         //String content1 = "【达州钢铁】您好!" + content + "退订";
         //String content1 = "【达州钢铁】您好!您在达钢购买的钢材已发车。司机电话:" + mobile + "。欲知详情，请前往达州钢铁智慧物流平台查看车辆实时轨迹。";
-        String content1 ="【达州钢铁】尊敬的用户，您在我公司采购的钢材，规格:Φ20(HRB400E)5件、Φ25(HRB400E)5件、Φ8(HPB300)2件，车牌号:陕F73979,司机电话:" + mobile + "，车辆已出厂配送中，欲知详情，请前往达州钢铁智慧物流平台查看车辆实际轨迹。";
+        String content1 ="【达州钢铁】尊敬的用户，您在我公司采购的钢材，规格:Φ20(HRB400E)5件、Φ25(HRB400E)5件、Φ8(HPB300)2件，车牌号:陕F73979,司机电话:" + mobile + "，收货地址：四川遂宁船山区科创西路88号。车辆已出厂配送中，欲知详情，请前往达州钢铁智慧物流平台查看车辆实际轨迹。";
         String sendUrl = url+"timestamp=" + tmpTmp + "&sign=" + sign + "&mobiles=" + mobile1 + "&content=" + content1;
         String jsonData = null;
         JSONObject jsonObject = new JSONObject();