wdy

jiaxiya/app/base/api/impl/transfer/tradeApi.js

@@ -11,7 +11,8 @@ class TradeTransferAPI extends APIBase {
         
         
     }
     }
     async acceptOrder(pobj, query) {
     async acceptOrder(pobj, query) {
-        return await this.tradetransferSve.createtransfer(pobj);
+        pobj.channelParams.fq_ordernum=pobj.orderNo;
+        return await this.tradetransferSve.createtransfer(pobj.channelParams);
     }
     }
     async closeOrder(pobj, query) {
     async closeOrder(pobj, query) {
         return await this.tradetransferSve.orderclose(pobj);
         return await this.tradetransferSve.orderclose(pobj);

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

@@ -69,11 +69,14 @@ class TradetransferService extends ServiceBase {
     var transferinfo = await this.findOne({ ali_bizid: obj.BizId });
     var transferinfo = await this.findOne({ ali_bizid: obj.BizId });
     if (transferinfo) {
     if (transferinfo) {
       return {
       return {
-        "errorCode": "OK",
-        "errorMsg": "订单已存在",
-        "module": { "orderId": transferinfo.fq_ordernum },
-        "requestId": obj.requestid,
-        "success": true
+        "status": 2,
+        "msg": "交付单已存在",
+        "data": {
+          "orderNo": obj.fq_ordernum,
+          "channelServiceNo": obj.BizId,
+          "channelParams": {}
+        },
+        "requestid": obj.requestid
       }
       }
     } else {
     } else {
       var source = {
       var source = {
@@ -86,18 +89,30 @@ class TradetransferService extends ServiceBase {
         fq_ordernum: obj.fq_ordernum
         fq_ordernum: obj.fq_ordernum
       }
       }
       var rtn = await this.create(source);
       var rtn = await this.create(source);
-      return {
-        status: 0,
-        msg:"成功",
-        data:null
-      }
-      return {
-        "errorCode": "OK",
-        "errorMsg": "",
-        "module": { "orderNumber": rtn },
-        "requestId": obj.requestid,
-        "success": true
+      if(rtn){
+        return {
+          "status": 0,
+          "msg": "success",
+          "data": {
+            "orderNo": obj.fq_ordernum,
+          "channelServiceNo": obj.BizId,
+            "channelParams": {}
+          },
+          "requestid": obj.requestid
+        }
+      }else{
+        return {
+          "status": -1,
+          "msg": "error",
+          "data": {
+            "orderNo": obj.fq_ordernum,
+          "channelServiceNo": obj.BizId,
+            "channelParams": {}
+          },
+          "requestid": obj.requestid
+        }
       }
       }
+      
     }
     }
   }
   }
   //订单查询
   //订单查询
@@ -279,7 +294,8 @@ class TradetransferService extends ServiceBase {
         SellerIdCard: obj.seller_idcard,
         SellerIdCard: obj.seller_idcard,
         SellerProxy: obj.seller_proxy,
         SellerProxy: obj.seller_proxy,
         RegistrationCert: obj.tm_cert_url,
         RegistrationCert: obj.tm_cert_url,
-        SellerApply: obj.seller_apply
+        SellerApply: obj.seller_apply,
+        Notarization: obj.notarization
       }
       }
     }
     }
     console.log(sobj);
     console.log(sobj);

jiaxiya/app/base/service/sve.base.js

@@ -12,7 +12,7 @@ class ServiceBase {
     this.execS = system.getObject("util.execClient");
     this.execS = system.getObject("util.execClient");
     this.channelApiUrl = settings.channelApiUrl();
     this.channelApiUrl = settings.channelApiUrl();
     this.appInfo = {
     this.appInfo = {
-      aliyuntmtransfer: { appkey: "201911131657", secret: "eeb18393aade40149287b024d8ba0850" }
+      aliyuntmtransfer: { appkey: "201912031344", secret: "7cbb846246874167b5c7e01cd0016c88" }
     };
     };
 
 
   }
   }
@@ -146,10 +146,10 @@ class ServiceBase {
       "sign": "2FviZ9PGws8Pt1fBhq0t90mjUvI",
       "sign": "2FviZ9PGws8Pt1fBhq0t90mjUvI",
       "actionBody": obj
       "actionBody": obj
     }
     }
-    // var tokenInfo = await this.getToken();
+    var tokenInfo = await this.getToken();
     var reqUrl = this.channelApiUrl + "/action/tradetransfer/aliclienttransfer";
     var reqUrl = this.channelApiUrl + "/action/tradetransfer/aliclienttransfer";
-    // var rtn = await this.execS.execPostTK(sobj, reqUrl, tokenInfo.data.token);
-    var rtn = await this.execS.execPostTK(sobj, reqUrl,"token");
+    var rtn = await this.execS.execPostTK(sobj, reqUrl, tokenInfo.data.token);
+    //var rtn = await this.execS.execPostTK(sobj, reqUrl,"token");
     return rtn;
     return rtn;
   }
   }
 
 

jiaxiya/app/front/vues/pages/tansfersupplymaterail/tansfersupplymaterail.html

@@ -72,6 +72,16 @@
                         mtype="test">
                         mtype="test">
                     </gsb-aliupload>
                     </gsb-aliupload>
                 </el-form-item>
                 </el-form-item>
+                <el-form-item label="商标证书" style="width:600px;">
+                    <gsb-aliupload v-model="supplymaterail.tm_cert_url" @uploadsuccess="upsuccess"
+                        mtype="test">
+                    </gsb-aliupload>
+                </el-form-item>
+                <el-form-item label="公证书" style="width:600px;">
+                    <gsb-aliupload v-model="supplymaterail.notarization_url" @uploadsuccess="upsuccess"
+                        mtype="test">
+                    </gsb-aliupload>
+                </el-form-item>
                 <div style="clear:both;"></div>
                 <div style="clear:both;"></div>
                 <div style="text-align:center">
                 <div style="text-align:center">
                     <el-button @click="onDlgFormClick(\'mysave\')">保存</el-button>
                     <el-button @click="onDlgFormClick(\'mysave\')">保存</el-button>