同步京东订单时，物流方式不对的问题。

watero-rst-service/src/main/java/com/iamberry/rst/service/order/OrderSyncLogServiceImpl.java

@@ -1267,11 +1267,16 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
                                             break;
                                         }
                                     }
-                                    salesOrder.setSalesPostNum(deliveryNo);   //快递单号
+                                    if (deliveryNo != null && deliveryNo.startsWith("JDV")) {
+                                        salesOrder.setSalesPostFirm("jd");
+                                    }
+                                    //快递单号
+                                    salesOrder.setSalesPostNum(deliveryNo);
                                 }
                                 break;
                             case 999:
-                                salesOrder.setSalesStatus(3);  //订单作废
+                                //订单作废
+                                salesOrder.setSalesStatus(3);
                                 break;
                             default:
                                 isStatus = false;
@@ -1283,8 +1288,10 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
                             continue;
                         }
 
-                        salesOrder.setSalesOrderId(String.valueOf(otherOrderId));  //小亚通订单编号
-                        salesOrder.setSalesDealCode(String.valueOf(otherOrderId));  //小亚通订单编号
+                        //小亚通订单编号
+                        salesOrder.setSalesOrderId(String.valueOf(otherOrderId));
+                        //小亚通订单编号
+                        salesOrder.setSalesDealCode(String.valueOf(otherOrderId));
                         salesOrder.setSalesExOrderId(otherExtOrderId);
 
                         //平台 SELF- 自身

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/MQTask.java

@@ -250,10 +250,10 @@ public class MQTask implements InitializingBean {
 	 * @param tel 手机号
 	 */
 	public void sendSMS(String relation,String postFirm,String postNum,Integer customerId,String tel){
-		if(postFirm != null && !postFirm.equals("") && postNum != null && !postNum.equals("")
-				&& customerId > 0 && !tel.equals("")){
+		if(postFirm != null && !"".equals(postFirm) && postNum != null && !postNum.equals("")
+				&& customerId > 0 && !"".equals(tel)){
 			postFirm =  KuaiDi100.replace(postFirm);
-			if(!postFirm.equals("")){
+			if(!"".equals(postFirm)){
 				ProductType productType = customerService.getcompanyAffiliation(customerId);
 				if(productType != null){
 					String rejected_text = "";

watero-rst-web/src/main/webapp/WEB-INF/web.xml

@@ -6,7 +6,7 @@
 
   <!--Session 配置-->
   <session-config>
-    <session-timeout>30</session-timeout>
+    <session-timeout>120</session-timeout>
     <cookie-config>
       <name>RST_WEB</name>
       <http-only>true</http-only>