Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

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

@@ -68,12 +68,13 @@ public class TmstruckSmsRusultServiceImpl  implements ITmstruckSmsRusultService
         String sign = MD5Util.sign("EUCP-EMY-SMS1-10QNI","EE20B0B28B75E567");
         String driverTel = tmstruckSmsRusultMapper.getDriverTel(orderId);
         String mobile1 = mobile.trim();
-        String content = "【达州钢铁】您好!您在达钢购买的钢材已发车。司机电话:" + driverTel + "。欲知详情，请前往达州钢铁智慧物流平台查看车辆实时轨迹。退订";
+        String content = "【达州钢铁】您好!您在达钢购买的钢材已发车。司机电话:" + 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);

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

@@ -2182,8 +2182,8 @@
                         ASO.sale_remark like '%${item}%'
                     </foreach>
                     </if>
-                    <if test="consigneeSsoId != null">
-                        and RC.CONSIGNEE_SSO_ID = #{consigneeSsoId}
+                    <if test="consigneeLoginName != null">
+                        and RC.CONSIGNEE_COMPANY_NAME LIKE '%${consigneeLoginName}%'
                     </if>
                     order by ASO.SALE_ORDER_ID DESC, ASOM.SALE_ORDER_MATERIAL_ID DESC,OO.ORDER_ID  DESC
                      )

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,file, RUNNING,errorfile,stdout
+log4j.rootCategory=INFO,file, RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout