ataidj

src/main/java/com/steerinfo/dil/controller/TmstruckSelfMachineController.java

@@ -32,8 +32,13 @@ public class TmstruckSelfMachineController extends BaseRESTfulController {
        return map;
     }
 
+    /**
+     * 送货单
+     * @param orderNumber
+     * @return
+     */
     @PostMapping("/getDeliveryOrder")
-    public Map<String,Object>getDeliveryOrder(String orderNumber){
+    public Map<String,Object>getDeliveryOrder(@RequestParam String orderNumber){
         Map<String,Object>map=tmstruckSelfMachineService.getDeliveryOrder(orderNumber);
         return map;
     }

src/main/java/com/steerinfo/dil/mapper/TmstruckSmsRusultMapper.java

@@ -11,6 +11,10 @@ import java.util.Map;
 
 @Mapper
 public interface TmstruckSmsRusultMapper extends IBaseMapper<TmstruckSmsRusult, BigDecimal> {
+
+
+    String getDriverTel(BigDecimal orderId);
+
     //查询最大ID
     @Select("select seq_tmstruck_sms.nextval from dual")
     BigDecimal selectMaxId();

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

@@ -41,9 +41,12 @@ public class TmstruckSelfMachineService implements ITmstruckSelfMachineService {
 
     @Override
     public Map<String, Object> getDeliveryOrder(String orderNumber) {
+        //1.根据运输订单号查询主干信息
         Map<String,Object> map = tmstruckLeaveFactoryResultMapper.getDeliveryOrder(orderNumber);
-        List<Map<String, Object>> deliveryOrderMaterialList = tmstruckLeaveFactoryResultMapper.getDeliveryOrderMaterial(orderNumber);
-        map.put("deliveryOrderMaterialList",deliveryOrderMaterialList);
+        if(map !=null){
+            List<Map<String, Object>> deliveryOrderMaterialList = tmstruckLeaveFactoryResultMapper.getDeliveryOrderMaterial(orderNumber);
+            map.put("deliveryOrderMaterialList",deliveryOrderMaterialList);
+        }
         return map;
     }
 }

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

@@ -66,8 +66,9 @@ public class TmstruckSmsRusultServiceImpl  implements ITmstruckSmsRusultService
         String url = "http://www.btom.cn:8080/simpleinter/sendSMS?appId=EUCP-EMY-SMS1-10QNI&";
         String tmpTmp = MD5Util.formatTimeTmp();
         String sign = MD5Util.sign("EUCP-EMY-SMS1-10QNI","EE20B0B28B75E567");
+        String driverTel = tmstruckSmsRusultMapper.getDriverTel(orderId);
         String mobile1 = mobile;
-        String content = "【达州钢铁】您好!您在达钢购买的钢材已发车。欲知详情，请前往https://wl.dasteel.cn:32322，浏览车辆实时运输状态。退订";
+        String content = "【达州钢铁】您好!您在达钢购买的钢材已发车。司机电话:" + driverTel + "。欲知详情，请前往达州钢铁智慧物流平台查看车辆实时轨迹。退订";
         String sendUrl = url+"timestamp=" + tmpTmp + "&sign=" + sign + "&mobiles=" + mobile1 + "&content=" + content;
         String jsonData = null;
         JSONObject jsonObject = new JSONObject();

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

@@ -1045,7 +1045,6 @@
             asom.sale_date_of_receipt "receiptDate",
             rsh.SHIPPER_NAME "shippername",
             sysdate "sendDate"
-
         from omstruck_order oo
                  left join
              rms_capacity rc
@@ -1097,7 +1096,7 @@
                  left join
              rms_material rm
              on
-                 rm.material_id = oom.order_material_id
+                 rm.material_id = oom.MATERIAL_ID
                  left join
              rms_unit_of_measure ruom
              on

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

@@ -378,4 +378,8 @@
       from   RMS_SHIPPER RS
       where  rs.SHIPPER_ID=#{bigDecimal}
     </select>
+  <select id="getDriverTel" resultType="java.lang.String" parameterType="decimal">
+      select OO.DRIVER_TEL from OMSTRUCK_ORDER OO
+        where OO.ORDER_ID = #{orderId}
+  </select>
 </mapper>