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

center-channel/app/base/api/impl/opaction/tmOrderCall.js

@@ -4,7 +4,7 @@ var settings = require("../../../../config/settings");
 class ProductAPI extends WEBBase {
 class ProductAPI extends WEBBase {
     constructor() {
     constructor() {
         super();
         super();
-        this.utilsOrderSve = system.getObject("service.utilsSve.utilsOrderSve");
+        this.utilsTmOrderCallSve = system.getObject("service.utilsSve.utilsTmOrderCallSve");
     }
     }
     /**
     /**
       * 接口跳转-POST请求
       * 接口跳转-POST请求
@@ -13,9 +13,6 @@ class ProductAPI extends WEBBase {
       * action_body     执行的参数
       * action_body     执行的参数
       */
       */
     async springBoard(pobj, qobj, req) {
     async springBoard(pobj, qobj, req) {
-        if (!pobj.actionProcess) {
-            return system.getResult(null, "actionProcess参数不能为空");
-        }
         if (!pobj.actionType) {
         if (!pobj.actionType) {
             return system.getResult(null, "actionType参数不能为空");
             return system.getResult(null, "actionType参数不能为空");
         }
         }
@@ -25,7 +22,6 @@ class ProductAPI extends WEBBase {
     async opActionProcess(pobj, action_type, req) {
     async opActionProcess(pobj, action_type, req) {
         pobj.requestId = req.requestId;
         pobj.requestId = req.requestId;
         var opResult = null;
         var opResult = null;
-        console.log("11111",opResult)
         switch (action_type) {
         switch (action_type) {
             case "queryTradeProduceList"://2020 0907 lin 新增 ali查询 用户确认资料支付尾款，并更新订单状态
             case "queryTradeProduceList"://2020 0907 lin 新增 ali查询 用户确认资料支付尾款，并更新订单状态
                 opResult = await this.utilsTmOrderCallSve.queryTradeProduceList(pobj, pobj.actionBody);
                 opResult = await this.utilsTmOrderCallSve.queryTradeProduceList(pobj, pobj.actionBody);

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

@@ -819,6 +819,7 @@ class UtilsOrderService extends AppServiceBase {
   
   
       pobj.actionType = "addOrder";
       pobj.actionType = "addOrder";
       var reqUrl = this.centerOrderUrl + "action/order/springBoard";
       var reqUrl = this.centerOrderUrl + "action/order/springBoard";
+      pobj.actionBody.channelOrder.orderStatus = 64;// 2020 0908 lin 新增。64作为orderinfo的orderStatus的值。含义为已付部分款
       var result = await this.restPostUrl(pobj, reqUrl);
       var result = await this.restPostUrl(pobj, reqUrl);
       if(result) {
       if(result) {
         var tmResult = {
         var tmResult = {

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

@@ -2,6 +2,7 @@ const system = require("../../../system");
 var settings = require("../../../../config/settings");
 var settings = require("../../../../config/settings");
 const querystring = require('querystring');
 const querystring = require('querystring');
 const AppServiceBase = require("../../app.base");
 const AppServiceBase = require("../../app.base");
+const { or } = require("sequelize");
 //订单操作类
 //订单操作类
 class UtilsTmOrderCallService extends AppServiceBase {
 class UtilsTmOrderCallService extends AppServiceBase {
   constructor() {
   constructor() {
@@ -9,8 +10,18 @@ class UtilsTmOrderCallService extends AppServiceBase {
     this.aliclient = system.getObject("util.aliyunClient");
     this.aliclient = system.getObject("util.aliyunClient");
   }
   }
 
 
-  async queryTradeProduceList(pobj, actionBody) {//修改联系人
-    return system.getResultSuccess();
+  async queryTradeProduceList(pobj, actionBody) {//2020 0907 lin 新增 ali查询 用户确认资料支付尾款，并更新订单状态
+    var obj = {
+      BuyerStatus: 11,
+      PageNum: 1,
+      PageSize: 20,
+      SortFiled: "updateTime",
+      SortOrder: "DESC",
+      type: "TM"
+    };
+    let orderList = await this.aliclient.reqbyget({ action: "QueryTradeProduceList", reqbody: obj });
+    console.log("orderList",orderList)
+    return system.getResultSuccess(orderList);
   }
   }
 
 
   async createjsonfile() {
   async createjsonfile() {

center-channel/app/config/routes/api.js

@@ -212,7 +212,7 @@ module.exports = function (app) {
 			return;
 			return;
 		}
 		}
 		// 2020 0812 lin 只去掉了check，因为要记录智能诊断的返回值，其他接口暂时未去掉
 		// 2020 0812 lin 只去掉了check，因为要记录智能诊断的返回值，其他接口暂时未去掉
-		if (["getAppTokenByHosts", "getAppTokenByAppKey", "test", "getIndustries", "getSecondIndustries", "getQualificationByIndustry", "counselling"].indexOf(req.body.actionType) >= 0) {
+		if (["getAppTokenByHosts", "getAppTokenByAppKey", "test", "getIndustries", "getSecondIndustries", "getQualificationByIndustry", "counselling","queryTradeProduceList"].indexOf(req.body.actionType) >= 0) {
 			req.body.actionBody.appHosts = req.host;
 			req.body.actionBody.appHosts = req.host;
 			next();
 			next();
 			return;
 			return;