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

@@ -311,6 +311,25 @@ public class AwaitSendController {
         if (eOrderRequestData == null) {
             return ResponseJson.getFAILURE().addResponseKeyValue("error","物流公司未设置对应的数据" + salesOrderInfo.getSalesPostFirm());
         }
+
+        //判断是否是京东订单  订单来源 2020年3月30日新增
+        if(salesOrderInfo.getSalesPostFirm().equals("jd") || salesOrderInfo.getSalesPostFirm().equals("JD")){
+            StoreInfo storeInfo = storeInfoService.getStoreInfoById(salesOrderInfo.getSalesStoreId());
+
+
+            if(storeInfo.getStoreName().indexOf("京东") == 1){
+                eOrderRequestData.ExpType = "1";
+                eOrderRequestData.ThrOrderCode = salesOrderInfo.getSalesOrderId();
+            }else if(storeInfo.getStoreName().indexOf("天猫") == 1){
+                    eOrderRequestData.ExpType = "2";
+            }else if(storeInfo.getStoreName().indexOf("苏宁") == 1){
+                    eOrderRequestData.ExpType = "3";
+            }else{
+                eOrderRequestData.ExpType = "6";
+            }
+        }
+
+
         // 组装通用数据
         eOrderRequestData.OrderCode = salesOrderInfo.getSalesOrderId();
         eOrderRequestData.PayType = (3);
@@ -957,6 +976,12 @@ public class AwaitSendController {
 
         salesOrder.setSalesOldDeliver(salesOrder.getSalesDeliver());
         salesOrder.setSalesDeliver(type);
+
+        //2020年3月31日新增 如果是上门提货订单，出库时自动标记为已揽件
+        if(type == 2 && salesOrder.getSalesPostFirm().equals("pick")){
+            salesOrder.setOrderCaseDate(new Date());
+        }
+
         Integer flag = 0;
         try{
             flag = salesOrderService.updateDeliver(salesOrder);

watero-rst-web/src/main/java/com/iamberry/rst/utils/OrderUtils.java

@@ -30,8 +30,9 @@ public class OrderUtils {
     private static final String AppKey="3597c368-9dc0-40b5-9cf2-86d9cb90e38a";
     // 正式环境地址：http://api.kdniao.cc/api/Eorderservice
     // 测试环境地址：http://testapi.kdniao.cc:8081/api/EOrderService
-    private static final String ReqURL= NameUtils.getConfig("ReqURL");
+       private static final String ReqURL= NameUtils.getConfig("ReqURL");
 //    private static final String ReqURL="http://testapi.kdniao.cc:8081/api/EOrderService";
+    //private static final String ReqURL="http://sandboxapi.kdniao.com:8080/kdniaosandbox/gateway/exterfaceInvoke.json";
 
     /**
      * Json方式 电子面单