tj

igirl-channel/app/base/service/impl/dborder/orderSve.js

@@ -852,8 +852,8 @@ class OrderService extends ServiceBase {
       });
       });
     }
     }
   }
   }
-  //------------新的产品查询----start---------
-/**
+  //------------新的产品查询----start---------------------------------------------------------------
+  /**
        * 获取启服务通订单交付信息
        * 获取启服务通订单交付信息
        * @param {*} pobj 
        * @param {*} pobj 
        * @param {*} actionBody 
        * @param {*} actionBody 
@@ -962,9 +962,27 @@ class OrderService extends ServiceBase {
     if (!token) {
     if (!token) {
       return system.getResultFail(-88, "获取token失败");
       return system.getResultFail(-88, "获取token失败");
     }
     }
+    //获取用户userpin
+    var userpin = "";
+    pobj.actionType = "getLoginByUserName";
+    pobj.actionBody.userName = actionBody.channelUserId;
+    pobj.actionBody.mobile = req.user.userMoblie;
+    var url = settings.centerChannelUrl() + "web/auth/accessAuth/springBoard";
+    var userpinResult = await this.execClient.execPushDataPost(pobj, url, token);
+    if (!userpinResult || !userpinResult.stdout) {
+      return system.getResult(null, userpinResult.msg);
+    }
+    var userpinResultTmp = JSON.parse(userpinResult.stdout);
+    if (userpinResultTmp.status != 0 && userpinResultTmp.status != 2060) {
+      return system.getResultFail(-99, "获取userpin失败");
+    }
+    userpin = userpinResultTmp.data.userpin;
+    if (!userpin) {
+      return system.getResultFail(-88, "获取userpin失败!!");
+    }
     pobj.actionType = "addOrder";
     pobj.actionType = "addOrder";
     var url = settings.centerChannelUrl() + "web/opaction/order/springBoard";
     var url = settings.centerChannelUrl() + "web/opaction/order/springBoard";
-    var rtn = await this.execClient.execPushDataPost(pobj, url, token);
+    var rtn = await this.execClient.execDataPostByTokenUserPin(pobj, url, token, userpin);
     if (!rtn || !rtn.stdout) {
     if (!rtn || !rtn.stdout) {
       return system.getResult(null, "execPost is empty");
       return system.getResult(null, "execPost is empty");
     }
     }
@@ -972,7 +990,6 @@ class OrderService extends ServiceBase {
     return result;
     return result;
   }
   }
 
 
-
   /**
   /**
    * 通过产品类别编码路径获取产品列表
    * 通过产品类别编码路径获取产品列表
    * @param {*} pobj 
    * @param {*} pobj 
@@ -1025,7 +1042,7 @@ class OrderService extends ServiceBase {
     return result;
     return result;
   }
   }
 
 
-  //------------end----------------
+  //------------新的产品查询----end--------------------------------------------------------------------------
 
 
   //-------------------------通联支付------start---------------------------------------------------------
   //-------------------------通联支付------start---------------------------------------------------------
   //获取center-channel token
   //获取center-channel token