Merge branch 'center-channel' of gitlab.gongsibao.com:jiangyong/zhichan into center-channel

center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js

@@ -1616,6 +1616,21 @@ class UtilsOrderService extends AppServiceBase {
   }
 
   async receiveAliTmOrder(pobj, actionBody) {
+    if (!actionBody.channelItemCode) {
+      return system.getResult(null, "产品编码有误，100010");
+    }
+    pobj.actionType = "getProductDetail";
+    var url = settings.centerAppUrl() + "action/opProduct/springBoard";
+    var productItemResult = await this.execPostByTimeOut(null, pobj, url);
+    if (productItemResult.status != 0) {
+      return productItemResult;
+    }
+    if (productItemResult.data.status != 0) {
+      return productItemResult.data;
+    }
+    pobj.productInfo = productItemResult.data.data;
+    pobj.productInfo.price_item = pobj.productInfo.price_list[0];
+    pobj.actionType = "receiveAliTmOrder";
     var reqUrl = this.centerOrderUrl + "action/order/springBoard";
     var result = await this.restPostUrl(pobj, reqUrl);
     return result;

center-channel/app/config/settings.js

@@ -32,9 +32,9 @@ var settings = {
   },
   enameClientUrl:function(){
     if (this.env == 'dev') {
-      return "https://ote.ename.com/icp/";
+      return "https://ote.ename.com/icp/";//开发
     }else{
-      return "https://ote.ename.com/icp/";
+      return "https://api.ename.com/icp/";//线上
     }
   },
   //百度icp、edi、nc、rt