gyq

tx-fi-tax/app/base/controller/impl/bizchance/deliverybillCtl.js

@@ -292,8 +292,7 @@ class DeliverybillCtl extends CtlBase {
     }
   }
 
-<<<<<<< HEAD
-
+  //服务状态变更通知
   async notifyServiceStatusChange (pobj, qobj, req) {
     let ab = pobj.actionBody;
     if (!ab.requestId || ab.requestId == "undefined") {
@@ -333,52 +332,26 @@ class DeliverybillCtl extends CtlBase {
           delivery_info: deliveryInfo,
         };
         await rtn.update(upObj, {where: whereObj});
-        // 通知业务人员服务状态已变更
-        // TODO: 怎么获取业务人员
-        // let salesmanId = rtn.salesman_id;
-
-        // TODO: 通知信息格式
-        // 通知信息
-        // let msg = {
-        //   "title": "",
-        //   "content": "",
-        //   "sender": "",
-        //   "sender_id": 0,
-        //   "msgType": "",
-        //   "target": {
-             
-        //   },
-        // };
-
-        // await this.msgService.create(msg);
-
         // 将变更结果插入到redis中
-        await this.cacheManager["TxCache"].cache(cacheStr, JSON.stringify(rtn), 180);
-        // console.log("================= test ==================\n")
-
+        await this.cacheManager["TxCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180);
         return {
           "status": 1,
           "msg": "处理成功",
           "data": rtn,
-          "requestId": ab.requestId,
+          "requestId": ab.requestId
         };        
       }
-    } catch (err) {
+    } 
+    catch (err) {
       return system.getResultError(err);
     }
   }
 
 
-=======
-  async portog(){
-    console.log(settings.port);
-  }
->>>>>>> 444217d31a9c45ccb0a1dea9f50b3197ab480970
 }
 module.exports = DeliverybillCtl;
 
 var task = new DeliverybillCtl();
-<<<<<<< HEAD
 var obj={
   "requestId":"1111111",
   "bizId": 2592748677,
@@ -402,50 +375,3 @@ task.notifyServiceStatusChange({actionBody: obj},{},{}).then(d=>{
 //   var d = await task.deliverInfo(obj,{},{})
 //   console.log("dddddd---------" + JSON.stringify(d));
 // })()
-=======
-var obj = {
-  "actionType": "produceData",
-  "actionBody": {
-    "pushUrl": "http://ic.com:8000/web/bizchance/deliverybillCtl",
-    "actionType": "insertInfo",
-    "identifyCode": "book-manage",
-    "messageBody": {
-      "requestId": "825da0a74432-738f-4bed-468d-d51aa880",
-      "bizId": "2292748809",
-      "userId": "24173452443103825",
-      "orderId": "235184456620496",
-      "areatype": "city",
-      "area": "100010",
-      "topOrgCode": "rong_yi_suan",
-      "taxpayerType": 1,
-      "contactMobile": "18510669321"
-    }
-  }
-}
-task.portog().then(d => {
-  console.log(JSON.stringify(d));
-})
-
-// var obj = {
-//   "actionType": "produceData",
-//   "actionBody": {
-//     "pushUrl": "http://ic.com:8000/web/bizchance/deliverybillCtl",
-//     "actionType": "insertInfo",
-//     "identifyCode": "book-manage",
-//     "messageBody": {
-//       "requestId": "825da0a74432-738f-4bed-468d-d51aa880",
-//       "bizId": "2292748809",
-//       "orderId": "235184456620496",
-//       "companyName": "北京融易算",
-//       "contactName": "JAMES7",
-//       "taxpayerType": 5,
-//       "contactMobile": "18510669367",
-//       "companyBizType": 1,
-//       "uscc": "911101053516460817K"
-//     }
-//   }
-// }
-// task.updateServer(obj, {}, {}).then(d => {
-//   console.log(JSON.stringify(d));
-// })
->>>>>>> 444217d31a9c45ccb0a1dea9f50b3197ab480970