tj

54943b58 · 宋毅 · 3ff3ea58 · 54943b58 · 54943b58 · 54943b58
Commit 54943b58 authored Mar 03, 2020 by 宋毅
11 changed files
--- a/center-channel/app/base/api/api.base.js
+++ b/center-channel/app/base/api/api.base.js
@@ -94,7 +94,7 @@ class APIBase {
                appid: req.app.id,
                appkey: req.app.uappKey,
                requestId: req.requestId,
-                op: pobj.classname + "/" + methodname,
+                op: req.classname + "/" + methodname,
                content: e.stack,
                clientIp: pobj.clientIp,
                agent: req.uagent,

--- a/center-channel/app/base/api/impl/opaction/order.js
+++ b/center-channel/app/base/api/impl/opaction/order.js
@@ -4,8 +4,7 @@ var settings = require("../../../../config/settings");
 class ProductAPI extends APIBase {
    constructor() {
        super();
-        this.utilsOrderSve = system.getObject("service.utilsSve.utilsOrderSve");
+        this.utilsOrderSve = system.getObject("service.utilsSve.utilsOrderSve");        
-        this.utilsPushSve = system.getObject("service.utilsSve.utilsPushSve");
    }
    /**
      * 接口跳转-POST请求
@@ -27,8 +26,7 @@ class ProductAPI extends APIBase {
        var opResult = null;
        switch (action_type) {
            case "addOrder"://创建订单
-                opResult = await this.utilsOrderSve.addOrder(pobj, pobj.actionBody);
+                opResult = await this.utilsOrderSve.addOrder(pobj, pobj.actionBody);         
-                await this.utilsPushSve.pushInfo(opResult, pobj, pobj.actionBody, "pushBusiness");
                break;
            case "getOrderInfo"://获取订单列表信息
                opResult = await this.utilsOrderSve.getOrderInfo(pobj, pobj.actionBody);

--- a/center-channel/app/base/service/impl/utilsSve/utilsFqAliyunSve.js
+++ b/center-channel/app/base/service/impl/utilsSve/utilsFqAliyunSve.js
@@ -8,33 +8,34 @@ class UtilsFqAliyunSve extends AppServiceBase {
  constructor() {
    super();
  }
-  async pushBusiness(pobj) {
+  async pushBusiness(actionBody) {
-    var add_order_info = pobj.actionBody.add_order_info;
+    var orderInfo = actionBody.order_info;
-    if (pobj.appInfo.pay_type != "00") {
+    if (!orderInfo) {
-      if (!add_order_info.orderStatus || Number(add_order_info.orderStatus) < 2) {
+      return "";
-        return "";
+    }
-      }
+    if (orderInfo.orderStatus < 2) {
+      return "";
    }
-    var orderContact = pobj.actionBody.orderContact;
+    var orderContact = actionBody.order_contact;
-    var product_info = pobj.actionBody.product_info;
+    var productInfo = actionBody.product_info;
-    if (!pobj.interface_params) {
+    if (!actionBody.interface_params) {
      return "";
    }
-    var interface_params_info = JSON.parse(pobj.interface_params);
+    var interface_params_info = JSON.parse(actionBody.interface_params);
    if (!interface_params_info || !interface_params_info.opUrl || !interface_params_info.key || !interface_params_info.secret) {
      return "";
    }
    var params = {
-      idempotentId: add_order_info.orderNo,// 是 业务 ID
+      idempotentId: orderInfo.orderNo,// 是 业务 ID
-      idempotentSource: product_info.service_business_code,// 是 业务来源（ic_jdyun、ic_ali）
+      idempotentSource: productInfo.service_business_code,// 是 业务来源（ic_jdyun、ic_ali）
-      idempotentSourceName: product_info.service_business_code,// 是 京东云应用、阿里云应用
+      idempotentSourceName: productInfo.service_business_code,// 是 京东云应用、阿里云应用
      city: "",// 否 所属城市
      phone: orderContact.mobile,// 是 手机号
-      userId: pobj.userInfo.channelUserId,// 否 用户 ID
+      userId: orderInfo.channelUserId,// 否 用户 ID
      companyName: "",// 否 公司名称
-      orderPrice: pobj.actionBody.totalSum,// 是 订单金额
+      orderPrice: orderInfo.totalSum,// 是 订单金额
-      productId: product_info.price_item.service_code,// 是 产品 ID
+      productId: productInfo.price_item.service_code,// 是 产品 ID
-      productQuantity: pobj.actionBody.quantity,// 是 产品数量
+      productQuantity: orderInfo.quantity,// 是 产品数量
    };
    var result = this.opAliyunClientPost("pushBusiness", interface_params_info.opUrl, interface_params_info.key, interface_params_info.secret, params);
  }

--- a/center-channel/app/base/service/impl/utilsSve/utilsOpOrderSve.js
+++ b/center-channel/app/base/service/impl/utilsSve/utilsOpOrderSve.js
@@ -9,7 +9,7 @@ class UtilsOpOrderService extends AppServiceBase {
  }
  async updateContacts(pobj, actionBody) {
    if (!actionBody.orderNo) {
-      return system.getResult(null, "actionBody.orderNo can not be empty");
+      return system.getResult(null, "actionBody.orderNo can not be empty，100310");
    }
    var reqUrl = this.centerOrderUrl + "opaction/opOrder/springBoard";
    var result = await this.restPostUrl(pobj, reqUrl);
@@ -17,7 +17,7 @@ class UtilsOpOrderService extends AppServiceBase {
  }
  async updateTmOrder(pobj, actionBody) {
    if (!actionBody.orderNo) {
-      return system.getResult(null, "actionBody.orderNo can not be empty");
+      return system.getResult(null, "actionBody.orderNo can not be empty，100320");
    }
    var reqUrl = this.centerOrderUrl + "opaction/opOrder/springBoard";
    var result = await this.restPostUrl(pobj, reqUrl);

--- a/center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js
+++ b/center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js
--- a/center-channel/app/base/service/impl/utilsSve/utilsProductSve.js
+++ b/center-channel/app/base/service/impl/utilsSve/utilsProductSve.js
@@ -17,7 +17,7 @@ class UtilsProductSve extends AppServiceBase {
   */
  async getProductList(pobj, actionBody) {
    if (!actionBody.pathCode) {
-      return system.getResult(null, "actionBody.pathCode can not be empty");
+      return system.getResult(null, "actionBody.pathCode can not be empty，100330");
    }
    pobj.actionBody.pathCode = "/" + actionBody.pathCode + "/";
    var url = settings.centerAppUrl() + "action/opProduct/springBoard";
@@ -30,7 +30,7 @@ class UtilsProductSve extends AppServiceBase {
   */
  async getProductDetail(pobj, actionBody) {
    if (!actionBody.channelItemCode) {
-      return system.getResult(null, "actionBody.channelItemCode can not be empty");
+      return system.getResult(null, "actionBody.channelItemCode can not be empty，100340");
    }
    var url = settings.centerAppUrl() + "action/opProduct/springBoard";
    return await this.restPostUrl(pobj, url);

--- a/center-channel/app/base/service/impl/utilsSve/utilsPushSve.js
+++ b/center-channel/app/base/service/impl/utilsSve/utilsPushSve.js
@@ -6,35 +6,29 @@ class UtilsPushService extends AppServiceBase {
  constructor() {
    super();
  };
-  async pushInfo(orderResult, pobj, actionBody, opType) {
+  async pushInfo(actionBody, opType) {
-    if (orderResult.status != 0) {
-      return "";
-    }
    var interface_list = actionBody.product_info.interface_info;
    if (!interface_list) {
      return "";
    }
-    var interface_info = null;
    var interface_list_temp = interface_list.filter(f => f.op_type == opType)
-    if (interface_list_temp && interface_list_temp.length > 0) {
+    if (!interface_list_temp || interface_list_temp.length == 0) {
-      interface_info = interface_list_temp[0];
-    }
-    if (!interface_info) {
      return "";
    }
-    pobj.actionBody.add_order_info = orderResult.data;
+    for (let index = 0; index < interface_list_temp.length; index++) {
-    var refOpResult = this.reflexAction(interface_info, pobj);
+      const element = interface_list_temp[index];
-    return refOpResult;
+      var refOpResult = this.reflexAction(element, actionBody);
+    }   
  }
  async reflexAction(interface_info, pobj) {
    var refResult = null;
    if (interface_info.interface_type == "bd") {
      if (!interface_info.method_name) {
-        return system.getResult(null, "产品接口参数信息有误，20110");
+        return system.getResult(null, "产品接口参数信息有误，100350");
      }//操作的方法名称
      var invokeObj = system.getObject(interface_info.interface_url);
      if (!invokeObj[interface_info.method_name]) {
-        return system.getResult(null, "产品接口参数方法信息有误，20130");
+        return system.getResult(null, "产品接口参数方法信息有误，100360");
      }
      pobj.interface_params = interface_info.params;
      var params = [pobj];

--- a/center-channel/app/config/routes/api.js
+++ b/center-channel/app/config/routes/api.js
@@ -4,13 +4,12 @@ var utilsAuthSve = system.getObject("service.utilsSve.utilsAuthSve");
 module.exports = function (app) {
 	//-----------------------新的模式------------------开始
 	app.use('/tlpay/notify', function (req, res) {
-		// var client_ip = system.get_client_ip(req);
+		var client_ip = system.get_client_ip(req);
-		// // req.body["client_ip"]=client_ip;
+		var utilsOrderSve = system.getObject("service.utilsSve.utilsOrderSve");
-		// var orderSve = system.getObject("service.dborder.orderSve");
+		var p = utilsOrderSve.receiveCallBackNotify(req.body,client_ip);
-		// var p = orderSve.receiveTlCallBackNotify(req.body);
+		p.then(r => {
-		// p.then(r => {
+			res.end(JSON.stringify(r));
-		// 	res.end(JSON.stringify(r));
+		});
-		// });
 	});
 	app.all("/web/*", async function (req, res, next) {
@@ -50,7 +49,7 @@ module.exports = function (app) {
 		req.body.appInfo = result.data;
 		req.body.actionProcess = result.data.app_code;
 		var lst = [
-			"addOrder", "getH5PayUrl", "getOrderQrCode", "queryOrderStatus","getOrderInfo", "getOrderDeliveryInfo", 
+			"addOrder", "getH5PayUrl", "getOrderQrCode", "queryOrderStatus", "getOrderInfo", "getOrderDeliveryInfo",
 			"getOrderDeliveryFlowInfo", "getOrderDeliveryFlowList", "getOrderLogInfo", "updateContacts", "updateTmOrder",
 			"getNeedInfo",//---暂时没有用到
 			"tmConfirm", "updateTmInfo",

--- a/center-channel/app/config/settings.js
+++ b/center-channel/app/config/settings.js
@@ -79,7 +79,7 @@ var settings = {
  },
  apiconfig: {
    opLogUrl: function () {
-      return settings.reqEsAddr() + "bigdata_zc_op_log/_doc?pretty";
+      return settings.reqEsAddr() + "center_channel_log/_doc?pretty";
    },
    opLogEsIsAdd: function () {
      return 1;

--- a/center-channel/app/front/entry/public/apidoc/platform/order.md
+++ b/center-channel/app/front/entry/public/apidoc/platform/order.md
@@ -18,6 +18,7 @@
 ``` javascript
 {
    "channelItemCode":"zzsbzc",// Y 产品的渠道编码
+    "channelItemAppendName":"",// Y 填写的商标名称
    "payCode": "zzsbzc-2", // Y 支付价格code
    "quantity":1,// Y 购买数量
    "totalSum":300,// Y 订单总金额---(商标自助注册计算格式：小于10项为产品价格×10，大于10项的为产品价格×小项数量)
@@ -199,6 +200,10 @@
            "opNotes": "",//操作备注
            "channelItemCode": "FW_GOODS-582221-1",//渠道产品编码
            "channelItemName": "京东云PLUS公司注册（北京市）",//渠道产品名称
+            "channelItemAppendName": "北京海淀",//渠道产品附加名称
+            "price":"10.00",//产品单价
+            "priceTypeName":"件",//产品单价单位名称
+            "priceDesc":"海淀区内资一般人",//产品单价描述            
            "serviceItemCode": null,//服务产品编码
            "picUrl": null,//产品图片地址
            "created_at":""//下单时间
@@ -221,6 +226,10 @@
            "opNotes": "",
            "channelItemCode": "FW_GOODS-582221-1",
            "channelItemName": "京东云PLUS公司注册（北京市）",
+            "channelItemAppendName": "",
+            "price":"10.00", 
+            "priceTypeName":"件", 
+            "priceDesc":"海淀区内资一般人", 
            "serviceItemCode": null,
            "picUrl": null,
            "created_at":""

--- a/center-channel/提示编码使用
+++ b/center-channel/提示编码使用
+已经使用的编码汇总：
+已经使用的编码汇总：
+100010
+100020
+100030  订单数量为空或有误，100030      
+100040  
+100050
+100060
+100070
+100080
+100090
+100100
+100110
+100120
+-100130  订单已支付，请勿重复付款，100130
+-100140  订单已支付，请勿重复付款，100140
+100150
+100160
+-100170  超时未支付，请刷新页面，100170 或100270
+-100180  请及时支付，100180 或100280
+100190
+100200
+100210
+100220
+100230
+100240
+100250
+100260
+100270
+100280
+100290
+100300
+100310
+100320
+100330
+100340
+100350
+100360