tj

igirl-channel/app/base/api/impl/action/tmOrder.js

@@ -62,7 +62,7 @@ class TmOrderAPI extends APIBase {
                 opResult = await this.toolSve.decryptStr(req.app, action_body.opStr);
                 break;
             case "op1688ChannelPushOrder"://处理渠道订单信息
-                opResult = await this.orderSve.op1688ChannelPushOrder(action_body);
+                opResult = await this.orderSve.op1688ChannelPushOrderTest(action_body, pobj, req);
                 if (opResult.status == 0) {
                     opResult.data = null;
                     var encryptResult = await this.toolSve.encryptStr(req.app, action_body.channelUserId);
@@ -93,6 +93,25 @@ class TmOrderAPI extends APIBase {
                     await this.pushData2(opResult, req, pobj, url);
                 }
                 break;
+            case "subExistTmOrder"://提交存在商标提报               
+                opResult = await this.ordertmproductSve.addExistTmOrder(action_body);
+                if (opResult && opResult.status == 0 && opResult.data) {
+                    var returnTms = opResult.data.tm;
+                    for (var i = 0; i < pobj.actionBody.nclones.length; i++) {
+                        var nclone = pobj.actionBody.nclones[i];
+                        for (var j = 0; j < returnTms.length; j++) {
+                            var returnTm = returnTms[j];
+                            if (returnTm.nclOne && nclone.code && returnTm.nclOne == nclone.code) {
+                                pobj.actionBody.nclones[i]["tbCode"] = returnTm.tbCode;
+                            }
+                        }
+                    }
+                    pobj.actionBody["deliveryOrderNo"] = opResult.data.deliveryOrderNo;
+                    // await this.pushData(opResult, req, pobj);
+                    var url = this.pushFqbossDataUrl + "api/channelaccessApi/createChannelOrder"
+                    await this.pushData2(opResult, req, pobj, url);
+                }
+                break;
             case "getTmOrderList"://商标交付列表
                 opResult = await this.ordertmproductSve.getTmOrderList(action_body);
                 break;
@@ -152,6 +171,9 @@ class TmOrderAPI extends APIBase {
                     await this.pushData2(opResult, req, pobj, url);
                 }
                 break;
+            case "pushFqBusiness"://推送商机到峰擎
+                opResult = await this.orderSve.pushFqBusiness(action_body, pobj, req);
+                break;
             default:
                 opResult = system.getResult(null, "action_type参数错误");
                 break;

igirl-channel/app/base/db/impl/dborder/orderDao.js

@@ -119,5 +119,38 @@ class OrderDao extends Dao {
       raw: true
     });
   }
+  async getItemByChannelServiceNo(channelServiceNo, appId) {//通过订单号查询订单    
+    return this.model.findOne({
+      where: {
+        channelServiceNo: channelServiceNo,
+        app_id: appId
+      },
+      attributes: ["id",
+        "orderNo",
+        "channelUserId",
+        "channelServiceNo",
+        "channelOrderNo",
+        "needNo",
+        "invoiceApplyStatus",
+        "orderType",
+        "salesNum",
+        "salesDiliverNum",
+        "minitermNum",
+        "minitermDiliverNum",
+        "orderPayStatus",
+        "notes",
+        "totalServiceCharge",
+        "totalPublicExpense",
+        "totalTaxes",
+        "totalSum",
+        "appPayType",
+        "payTime",
+        "itemCode",
+        "itemName",
+        "buyerMoblie"
+      ],
+      raw: true
+    });
+  }
 }
 module.exports = OrderDao;

igirl-channel/app/base/db/models/dborder/order.js

@@ -59,7 +59,8 @@ module.exports = (db, DataTypes) => {
     picUrl                 :DataTypes.STRING(500),//  产品图片地址                                                                                                                                               
     productType_id         :DataTypes.INTEGER,        //产品类型Id
     productOneType_id      :DataTypes.INTEGER,        //产品大类Id                                                                                                                                    
-    serviceItemSnapshot    :DataTypes.TEXT,           //产品快照      
+    serviceItemSnapshot    :DataTypes.TEXT,           //产品快照  
+    buyerMoblie   :DataTypes.STRING(64),         //  买家手机号   
   }, {
       paranoid: false,//假的删除
       underscored: true,