tiujai

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

@@ -40,12 +40,6 @@ public class TmstruckSmsRusultController extends BaseRESTfulController{
     ESFeign esFeign;
     @Autowired
     ColumnDataUtil columnDataUtil;
-    @ApiOperation(value = "新增短信实绩", notes = "通过人工稽核判断点击新增短信实绩")
-    @PostMapping(value = "/insertSmsResult")//BigDecimal
-    public RESTfulResult insertSmsResult(@RequestBody(required = false) Map<String, Object> map) throws Exception {
-        int i = tmstruckSmsRusultService.addSmsResult(map);
-        return success(i);
-    }
     //查询短信实绩
     @ApiOperation(value="查询短信实绩")
     @ApiImplicitParams({

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

@@ -62,4 +62,6 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
 
     Integer getSeq(BigDecimal orderId);
 
+    Map<String, Object> getMessageMap(BigDecimal orderId);
+
 }

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

@@ -58,7 +58,7 @@ public interface UtilsMapper {
     //通过运输订单号查询订单ID
     BigDecimal getOrderIdByOrderNumber(String orderNumber);
 
-    //通过运输订单号查询总实绩ID
+    //通过运输订单id查询总实绩ID
     BigDecimal getTotalIdByOrderNumber(String orderNumber);
 
 
@@ -131,4 +131,6 @@ public interface UtilsMapper {
     //通过车牌号和运输订单号去寻找装车实绩
     BigDecimal getLoadResultId(Map<String,Object> map);
 
+    BigDecimal getTotalIdByOrderId(BigDecimal orderId);
+
 }

src/main/java/com/steerinfo/dil/service/ITmstruckSmsRusultService.java

@@ -20,9 +20,8 @@ import java.util.Map;
  * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  */
-public interface ITmstruckSmsRusultService extends IBaseService<TmstruckSmsRusult, BigDecimal>{
-  //新增短信
- int addSmsResult(Map<String ,Object> map) throws Exception;
+public interface ITmstruckSmsRusultService{
+
  //查询短信实绩
  List<Map<String,Object>> getSmsResult(Map<String,Object> map);
 }

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

@@ -60,6 +60,9 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
     @Autowired
     OffSiteTransportationServiceImpl offSiteTransportationService;
 
+    @Autowired
+    TmstruckSmsRusultServiceImpl tmstruckSmsRusultService;
+
     @Autowired
     OmsFeign omsFeign;
 
@@ -211,6 +214,13 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                     throw new Exception("请提醒司机确认订单！");
                 }
                 try {
+                    //发送短信
+                    Map<String,Object>messageMap = tmstruckLeaveFactoryResultMapper.getMessageMap(orderId);
+                    if(messageMap.get("saleOrderConsigneeTEL") != null){
+                            String capacityNum = (String) messageMap.get("capacityNumber");
+                            String mobile = (String)messageMap.get("saleOrderConsigneeTEL");
+                            tmstruckSmsRusultService.generaSendMessage(mobile,capacityNum,orderId);
+                    }
                     //销售厂外监控
                     Map<String, Object> parem=tmstruckLeaveFactoryResultService.getTruckFactoryResult(orderNumber);
                     parem.put("turnOf","0");

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

@@ -2,20 +2,12 @@ package com.steerinfo.dil.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.google.gson.JsonObject;
-import com.steerinfo.dil.feign.JoinFeign;
-import com.steerinfo.dil.mapper.TmstruckLeaveFactoryResultMapper;
 import com.steerinfo.dil.mapper.TmstruckSmsRusultMapper;
 import com.steerinfo.dil.mapper.UtilsMapper;
 import com.steerinfo.dil.model.TmstruckSmsRusult;
 import com.steerinfo.dil.service.ITmstruckSmsRusultService;
 import com.steerinfo.dil.util.HTTPRequestUtils;
 import com.steerinfo.dil.util.MD5Util;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import okio.Utf8;
-import org.apache.http.ParseException;
-import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -41,48 +33,35 @@ import java.util.Map;
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  */
 @Service(value = "tmstruckSmsRusultService")
-public class TmstruckSmsRusultServiceImpl extends BaseServiceImpl<TmstruckSmsRusult, BigDecimal> implements ITmstruckSmsRusultService {
+public class TmstruckSmsRusultServiceImpl  implements ITmstruckSmsRusultService {
 
     @Autowired
     private TmstruckSmsRusultMapper tmstruckSmsRusultMapper;
     @Autowired
     private UtilsMapper utilsMapper;
-    @Autowired
-    JoinFeign joinFeign;
 
 
-    @Override
-    protected IBaseMapper<TmstruckSmsRusult, BigDecimal> getMapper() {
-        return tmstruckSmsRusultMapper;
-    }
-
     /**
-     * 销售物流通过点击确认新增短信实绩
-     * @param map
+     * 新增短信实绩
+      * @param orderId
      * @return
+     * @throws Exception
      */
-    @Override
-    public int addSmsResult(Map<String,Object> map) throws Exception {
-
-        //获取订单号
-        String orderNumber = map.get("orderNumber").toString();
+    public int addSmsResult(BigDecimal orderId) throws Exception {
         //新增短信实绩
         TmstruckSmsRusult tmstruckSmsRusult=new TmstruckSmsRusult();
         tmstruckSmsRusult.setResultId(tmstruckSmsRusultMapper.selectMaxId());
         //新增总实绩id
-        BigDecimal resultTotalId = utilsMapper.getTotalIdByOrderNumber(orderNumber);
+        BigDecimal resultTotalId = utilsMapper.getTotalIdByOrderId(orderId);
         tmstruckSmsRusult.setTotalResultId(resultTotalId);
         tmstruckSmsRusult.setResultSendingTime(new Date());
         //新增短信实绩
         tmstruckSmsRusult.setInsertTime(new Date());
         tmstruckSmsRusultMapper.insertSelective(tmstruckSmsRusult);
         return 1;
-
-
-
     }
 
-    public int generaSendMessage(String mobile,String capacityNum) throws Exception {
+    public int generaSendMessage(String mobile,String capacityNum,BigDecimal orderId) throws Exception {
         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");
@@ -98,7 +77,7 @@ public class TmstruckSmsRusultServiceImpl extends BaseServiceImpl<TmstruckSmsRus
             String code = (String) hashMap.get("code");
             System.out.println(hashMap.get("code"));
             if("SUCCESS".equals(code)){
-                return 1;
+                return addSmsResult(orderId);
             }else{
                 return 0;
             }

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

@@ -1230,4 +1230,15 @@
         where oo.order_id =#{orderId}
     </select>
     <select id="getLeaveFactoryList" resultType="java.util.Map"></select>
+    <select id="getMessageMap" resultType="java.util.Map" parameterType="decimal">
+        SELECT
+            ASOM.SALE_ORDER_CONSIGNEE_TEL AS "saleOrderConsigneeTEL",
+            RC.CAPACITY_NUMBER AS "capacityNumber"
+        FROM
+            OMSTRUCK_ORDER OO
+                LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                LEFT JOIN RMS_CAPACITY RC ON OO.CAPACITY_ID = RC.CAPACITY_ID
+        WHERE
+            OO.ORDER_ID = #{orderId}
+    </select>
 </mapper>