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

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

@@ -108,6 +108,9 @@ class ProductAPI extends WEBBase {
             case "receiveAliTmOrderRefund"://接收阿里商标订单退款信息
             case "receiveAliTmOrderRefund"://接收阿里商标订单退款信息
                 opResult = await this.utilsOrderSve.receiveAliTmOrderRefund(pobj, pobj.actionBody);
                 opResult = await this.utilsOrderSve.receiveAliTmOrderRefund(pobj, pobj.actionBody);
                 break;
                 break;
+            case "getOrderIdFrom360":
+                opResult = await this.utilsOrderSve.getOrderIdFrom360(pobj,pobj.actionBody);
+                break;
             default:
             default:
                 opResult = system.getResult(null, "action_type参数错误");
                 opResult = system.getResult(null, "action_type参数错误");
                 break;
                 break;

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

@@ -424,7 +424,7 @@ class UtilsNeedService extends AppServiceBase {
       }
       }
       self.utilsPushSve.business2Channel(reqParams, "updateChanceStatus");
       self.utilsPushSve.business2Channel(reqParams, "updateChanceStatus");
       self.utilsPushSve.business2Channel(pobj, "pushCloseICPNeed");
       self.utilsPushSve.business2Channel(pobj, "pushCloseICPNeed");
-    } 
+    }
     return result;
     return result;
   }
   }
 
 
@@ -525,6 +525,9 @@ class UtilsNeedService extends AppServiceBase {
       if (!actionBody.status) {
       if (!actionBody.status) {
         return system.getResult(null, "actionBody.status can not be empty，100495");
         return system.getResult(null, "actionBody.status can not be empty，100495");
       }
       }
+      if (actionBody.status == 3) {//3为资料未确认(暂时不用做处理)
+        return system.getResultSuccess();
+      }
       if (actionBody.businessLicense) {
       if (actionBody.businessLicense) {
         actionBody.newbusinessLicense = await self.opDownFileInfo(actionBody.businessLicense);
         actionBody.newbusinessLicense = await self.opDownFileInfo(actionBody.businessLicense);
       }
       }
@@ -875,7 +878,7 @@ class UtilsNeedService extends AppServiceBase {
     var spobj = [];
     var spobj = [];
     // 遍历生成阿里需求 并把bizId 填充进数组
     // 遍历生成阿里需求 并把bizId 填充进数组
     for (var i = 0; i < actionBody.demands.length; i++) {
     for (var i = 0; i < actionBody.demands.length; i++) {
-      // 第一步 
+      // 第一步
       // 地区转换
       // 地区转换
       var area = this.areaChange(actionBody.demands[i].area)
       var area = this.areaChange(actionBody.demands[i].area)
       // SubmitIcpIntention需要的类型转换ICP许可证 = 5/EDI许可证 = 7
       // SubmitIcpIntention需要的类型转换ICP许可证 = 5/EDI许可证 = 7
@@ -935,7 +938,7 @@ class UtilsNeedService extends AppServiceBase {
       obj1.actionBody = npobj[i];
       obj1.actionBody = npobj[i];
       var opResult = await this.submitNeed(obj1, obj1.actionBody);
       var opResult = await this.submitNeed(obj1, obj1.actionBody);
       console.log("needBatchUpload-opResult", opResult)
       console.log("needBatchUpload-opResult", opResult)
-      // 第三步 
+      // 第三步
       // 提交Icp注册方案
       // 提交Icp注册方案
       // 程序执行比异步分配需求快，所以写成两个循环
       // 程序执行比异步分配需求快，所以写成两个循环
       var objString2 = JSON.stringify(pobj);
       var objString2 = JSON.stringify(pobj);
@@ -1569,7 +1572,7 @@ class UtilsNeedService extends AppServiceBase {
       } else if (pobj.actionBody.channel_type_code == "edinb") {
       } else if (pobj.actionBody.channel_type_code == "edinb") {
         pobj.actionBody.type = "yiming.edinb";
         pobj.actionBody.type = "yiming.edinb";
         pobj.actionBody.idempotentSource = "yiming.edinb";
         pobj.actionBody.idempotentSource = "yiming.edinb";
-      } 
+      }
     }
     }
     if (pobj.actionBody.description && pobj.actionBody.description.indexOf("备#") < 0) {
     if (pobj.actionBody.description && pobj.actionBody.description.indexOf("备#") < 0) {
       pobj.actionBody.level = "A";
       pobj.actionBody.level = "A";

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

@@ -1244,6 +1244,7 @@ class UtilsOrderService extends AppServiceBase {
                 channel_nickname: opOrderResult.data.order_info.channelUserId
                 channel_nickname: opOrderResult.data.order_info.channelUserId
             };
             };
             opOrderResult.data.orderNo = params.orderNo;
             opOrderResult.data.orderNo = params.orderNo;
+            opOrderResult.data.idempotentNo = opOrderResult.data.order_info.channelOrderNo
             opOrderResult.data.order_info.pay_flow_no = params.trade_no || "";// 2020 0704 lin 新增 推送fq必填字段
             opOrderResult.data.order_info.pay_flow_no = params.trade_no || "";// 2020 0704 lin 新增 推送fq必填字段
             opOrderResult.data.order_info.pay_channel = params.payType || "";//付款方式
             opOrderResult.data.order_info.pay_channel = params.payType || "";//付款方式
             opOrderResult.data.order_info.pay_time = params.payTime;//付款时间
             opOrderResult.data.order_info.pay_time = params.payTime;//付款时间
@@ -1763,6 +1764,29 @@ class UtilsOrderService extends AppServiceBase {
         var result = await this.restPostUrl(pobj, reqUrl);
         var result = await this.restPostUrl(pobj, reqUrl);
         return result;
         return result;
     }
     }
+
+    /**
+     * 根据企服通订单号获取360订单号
+     * @param pobj
+     * @param actionBody
+     * @returns {Promise<void>}
+     */
+    async getOrderIdFrom360(pobj,actionBody){
+        let rtnt = await this.execClient.exec360GetToken(settings.tokenUrl360())
+        let result = JSON.parse(rtnt.stdout);
+        let token = result.access_token;
+        let orderNo = actionBody.orderNo
+        let subData = "gsb_order_id=" + orderNo + "&token=" + token;
+        let url = settings.pushUrl360() + "api/v1/eshop/GetOrderInfo";
+        let rtn = await this.restClient.execGet(subData, url);
+        if (!rtn || !rtn.stdout) {
+            return system.getResult(null, "restGet data is empty");
+        }
+        let checkRet = JSON.parse(rtn.stdout);
+        if (checkRet.code != 200) {
+            return system.getResultFail(-1, checkRet.msg)
+        }
+    }
 }
 }
 
 
 module.exports = UtilsOrderService;
 module.exports = UtilsOrderService;