发送短信改造

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

@@ -78,6 +78,9 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
 
     @Autowired
     JoinFeign joinFeign;
+
+    @Autowired
+    TmstruckSelfMachineService tmstruckSelfMachineService;
     //果园库测试接口："http://113.204.217.110:9810/dagang/receiving";
     //果园库正式接口
     private  String guoYuanUrl="http://114.117.208.165:9810/dagang/receiving";
@@ -371,11 +374,22 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 }
                 try {
                     //发送短信
-                    Map<String,Object> messageMap = tmstruckLeaveFactoryResultMapper.getMessageMap(orderId);
-                    if(messageMap.get("saleOrderConsigneeTEL") != null){
+                    //Map<String,Object> messageMap = tmstruckLeaveFactoryResultMapper.getMessageMap(orderId);
+                    Map<String,Object> messageMap = tmstruckSelfMachineService.getDeliveryOrder(orderNumber);
+                    //非自提发送短信
+                    if(messageMap.get("consigneeTel") != null && "否".equals(messageMap.get("saleOrderIsselfmention"))){
                             String capacityNum = (String) messageMap.get("capacityNumber");
-                            String mobile = (String)messageMap.get("saleOrderConsigneeTEL");
-                            tmstruckSmsRusultService.generaSendMessage(mobile,capacityNum,orderId);
+                            String mobile = (String)messageMap.get("consigneeTel");
+                            //物资查询
+                            List<Map<String, Object>> deliveryOrderMaterialList = (List<Map<String, Object>>) messageMap.get("deliveryOrderMaterialList");
+                            String message = "";
+                            for(Map<String,Object> dateMap :deliveryOrderMaterialList){
+                                String materialSpe =  dateMap.get("materialSpe") == null ? "" : dateMap.get("materialSpe").toString();
+                                String materialModel =  dateMap.get("materialModel") == null ? "" : dateMap.get("materialModel").toString();
+                                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));
                     }
                     // 调用结算
                 }catch (Exception ex){

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

@@ -93,17 +93,48 @@ public class TmstruckSmsRusultServiceImpl  implements ITmstruckSmsRusultService
         }
     }
 
+    public int generaSendMessageNew(String mobile,String capacityNum,BigDecimal orderId, String message) 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-0RHMZ","960ABC95153C60F0");
+        String driverTel = tmstruckSmsRusultMapper.getDriverTel(orderId);
+        String mobile1 = Pattern.compile("[^0-9]").matcher(mobile).replaceAll("");
+        String content ="【达州钢铁】尊敬的用户，您在我公司采购的钢材，规格:" + message + "，车牌号:" + capacityNum + "，司机电话:" + driverTel + "，车辆已出厂配送中，欲知详情，请前往达州钢铁智慧物流平台查看车辆实际轨迹。";
+        String sendUrl = url+"timestamp=" + tmpTmp + "&sign=" + sign + "&mobiles=" + mobile1 + "&content=" + content;
+        System.out.println(mobile1);
+        String jsonData = null;
+        JSONObject jsonObject = new JSONObject();
+        jsonData = HTTPRequestUtils.send(sendUrl,jsonObject,"utf-8");
+        System.out.println(jsonData);
+        if(!"null".equals(jsonData)){
+            System.out.println(jsonData);
+            HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);
+            String code = (String) hashMap.get("code");
+            System.out.println(hashMap.get("code"));
+            if("SUCCESS".equals(code)){
+                return addSmsResult(orderId,content);
+            }else{
+                return 0;
+            }
+        }else{
+            System.out.println("短信发送失败：" + jsonData);
+            return 0;
+        }
+    }
+
     @Override
     public int sendMessage(String mobile,String content) throws Exception{
-        String url = "http://www.btom.cn:8080/simpleinter/sendSMS?appId=EUCP-EMY-SMS1-10QNI&";
+        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-10QNI","EE20B0B28B75E567");
+        String sign = MD5Util.sign("EUCP-EMY-SMS1-2G25B","960ABC95153C60F0");
         String mobile1 = mobile;
-        String content1 = "【达州钢铁】您好!" + content + "退订";
+        //String content1 = "【达州钢铁】您好!" + content + "退订";
+        //String content1 = "【达州钢铁】您好!您在达钢购买的钢材已发车。司机电话:" + mobile + "。欲知详情，请前往达州钢铁智慧物流平台查看车辆实时轨迹。";
+        String content1 ="【达州钢铁】尊敬的用户，您在我公司采购的钢材，规格:Φ20(HRB400E)5件、Φ25(HRB400E)5件、Φ8(HPB300)2件，车牌号:陕F73979,司机电话:" + mobile + "，车辆已出厂配送中，欲知详情，请前往达州钢铁智慧物流平台查看车辆实际轨迹。";
         String sendUrl = url+"timestamp=" + tmpTmp + "&sign=" + sign + "&mobiles=" + mobile1 + "&content=" + content1;
         String jsonData = null;
         JSONObject jsonObject = new JSONObject();
-        jsonData = HTTPRequestUtils.send(sendUrl,jsonObject,"utf-8");
+        jsonData = HTTPRequestUtils.send(sendUrl, jsonObject, "utf-8");
         if(!"null".equals(jsonData)){
             System.out.println(jsonData);
             HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);

src/main/resources/com/steerinfo/dil/mapper/TmstruckLeaveFactoryResultMapper.xml

@@ -1044,7 +1044,8 @@
             asom.sale_order_consignee "consignee",
             asom.sale_order_consignee_tel "consigneeTel",
             rsh.SHIPPER_NAME "shippername",
-            sysdate "sendDate"
+            sysdate "sendDate",
+            aso.SALE_ORDER_ISSELF_MENTION "saleOrderIsselfmention"
         from omstruck_order oo
                  left join
              rms_capacity rc