d

jiaxiya/app/base/service/impl/transfer/tradetransferSve.js

@@ -523,42 +523,16 @@ class TradetransferService extends ServiceBase {
   }
   //买卖家沟通记录
   async writecommunicationlog(obj) {
-    let faillist = [];
-    let transferinfo = await this.findOne({ ali_bizid: obj.ali_bizid });
-    let self = this;
-    await this.db.transaction(async function (t) {
-      let params = {
-          creter: obj.user,
-          BizId: obj.ali_bizid,
-          time: obj.trackDate,
-          note: obj.note
-      };
-      
-      if(transferinfo.communicationLog.length == 0){
-        transferinfo.communicationLog = [];
-        transferinfo.communicationLog.push(params);
-      }else{
-        transferinfo.communicationLog = JSON.parse(transferinfo.communicationLog);
-        transferinfo.communicationLog.push(params);
-      }
-      params = JSON.stringify(transferinfo.communicationLog);
-      let upd =self.dao.model.update({communicationLog : params }, { where: { ali_bizid: obj.ali_bizid } }); 
-      if (!upd) {
-        faillist.push(obj.ali_bizid);
+    var obj = {
+      action: "WriteCommunicationLog",
+      reqbody: {
+        BizId: obj.ali_bizid,
+        note: obj.note
       }
-
-      //调用阿里接口
-      // let aliObj = {
-      //   action: "WriteCommunicationLog",
-      //   reqbody: {
-      //     BizId: obj.ali_bizid,
-      //     note: obj.note
-      //   }
-      // }
-      // this.aliclient(aliObj);
-      return ;
-  });
-    
+    }
+    var rtn = await this.aliclient(obj)
+    console.log(rtn)
+    return rtn;
   }
 
   //获取签名
@@ -641,4 +615,4 @@ function buildurl(url){
   }
   return url
 }
-module.exports = TradetransferService;
+module.exports = TradetransferService;
\ No newline at end of file

jiaxiya/app/front/vues/pages/tradetransferdiliver/tradetransferdiliver.js

@@ -118,7 +118,6 @@
       this.trackVisable=false;
     },
     saveClick(){
-<<<<<<< HEAD
       if(this.trackContent==""){
         return;
       }
@@ -132,19 +131,6 @@
          self.currentRow.tracklog=d.data.tracklog;
          self.handlerTrackLog(self.currentRow);
         
-=======
-      let pushData={
-          "trackDate":new Date().toLocaleString(),
-          "note":this.trackContent,
-          "ali_bizid": 'trademark_prepayment_pre-cn-v0h1mda5i0i',
-          "user": 51
-      };
-      var self=this;
-      this.$root.postReq("/web/transfer/tradetransferCtl/updateCommunicationLog", pushData).then(function (d) {
-        /*返回整个跟进字段，解析为数组*/
-        self.trackRecords.push(d.data);
-
->>>>>>> 71ceef3aff931c3fa95f0a89875de812b8a8a989
       })
       
     }