Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/SalesOrderService.java

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -315,13 +315,12 @@ public class AwaitSendController {
         if(salesOrderInfo.getSalesPostFirm().equals("jd") || salesOrderInfo.getSalesPostFirm().equals("JD")){
             StoreInfo storeInfo = storeInfoService.getStoreInfoById(salesOrderInfo.getSalesStoreId());
 
-
-            if(storeInfo.getStoreName().indexOf("京东") == 1){
+            if(storeInfo.getStoreName().contains("京东")){
                 eOrderRequestData.ExpType = "1";
-                eOrderRequestData.ThrOrderCode = salesOrderInfo.getSalesOrderId();
-            }else if(storeInfo.getStoreName().indexOf("天猫") == 1){
+                eOrderRequestData.ThrOrderCode = salesOrderInfo.getSalesExOrderId();
+            }else if(storeInfo.getStoreName().contains("天猫")){
                     eOrderRequestData.ExpType = "2";
-            }else if(storeInfo.getStoreName().indexOf("苏宁") == 1){
+            }else if(storeInfo.getStoreName().contains("苏宁")){
                     eOrderRequestData.ExpType = "3";
             }else{
                 eOrderRequestData.ExpType = "6";