Merge branch 'jiaxiya' of gitlab.gongsibao.com:jiangyong/zhichan into jiaxiya

jiaxiya/app/base/controller/impl/transfer/tradetransferCtl.js

@@ -157,7 +157,10 @@ class TradetransferCtl extends CtlBase {
         p.aliorder_status = "3",
           result = await this.service.supplymaterail(p)
       }
-      
+      if (p.transfer_status == "MATERIALS_TO_BE_SUBMITTED") {
+        p.aliorder_status = "26",
+          result = await this.service.modifySubmitTransferMaterail(p)
+      }
       if (p.transfer_status == "BUYER_EXPRESS") {
         p.aliorder_status = "5",
           result = await this.service.posttransfermatereial(p)
@@ -200,7 +203,7 @@ class TradetransferCtl extends CtlBase {
         var rd = await this.service.update(p);
         return system.getResult(rd);
       } else {
-        return system.getResult(null, "阿里请求失败");
+        return system.getResult(null, "阿里请求失败。" + (result.msg || result.errorMsg || ""));
       }
 
     } catch (error) {

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

@@ -315,6 +315,46 @@ class TradetransferService extends ServiceBase {
     return result;
   }
 
+//服务商修改资料后重新提交
+async modifySubmitTransferMaterail(obj) {
+  obj.buyer_businesslicense =buildurl(obj.buyer_businesslicense)
+  obj.buyer_idcard =buildurl(obj.buyer_idcard)
+  obj.seller_businesslicense =buildurl(obj.seller_businesslicense)
+  obj.seller_idcard =buildurl(obj.seller_idcard)
+  obj.seller_proxy =buildurl(obj.seller_proxy)
+  obj.tm_cert_url =buildurl(obj.tm_cert_url)
+  obj.seller_apply =buildurl(obj.seller_apply)
+  obj.transfer_cert_url =buildurl(obj.transfer_cert_url)
+  obj.notarization_url =buildurl(obj.notarization_url)
+  obj.user_type = obj.user_type == "person" ? 2 : 1;
+  var sobj = {
+    action: "ModifySubmitTransferMaterail",
+    reqbody: {
+      BizId: obj.ali_bizid,
+      BuyerBusinessLicense: obj.buyer_businesslicense,
+      BuyerIdCard: obj.buyer_idcard,
+      RegistrationCert: obj.tm_cert_url,
+      Notarization: obj.notarization_url + "," + obj.transfer_cert_url,
+      SellerBusinessLicense: obj.seller_businesslicense,
+      SellerIdCard: obj.seller_idcard,
+      SellerProxy: obj.seller_proxy,
+      SellerApply: obj.seller_apply,
+      Complete: true,
+      Name: obj.buyer_name,
+      Addr: obj.buyer_address,
+      CardType: obj.user_type,
+      CardNo: obj.cardno,
+      ContactName: obj.contact_name,
+      ContactMobile: parseInt(obj.contact_mobile),
+      ContactEmail: obj.contact_email
+    }
+  }
+  var result = await this.aliclient(sobj)
+  console.log(result);
+  return result;
+  // return {Success:false,msg:""}
+}
+
   //尾款支付---调取阿里云查询后修改订单
   async querytradeproducelist(obj) {
     if (!obj.ali_bizid) {
@@ -388,14 +428,42 @@ class TradetransferService extends ServiceBase {
         msg: "参数异常"
       }
     }
+
+    if(!obj.transfer_receive_ack){
+      return {
+        status: "-1",
+        msg: "参数异常：商标局回执不能为空"
+      }
+    }
+
+    if(!obj.seller_proxy){
+      return {
+        status: "-1",
+        msg: "参数异常：受让人委托书不能为空"
+      }
+    }
+
+    const entity = await this.findById(obj.id);
+    // 只有当前流程状态等于 阿里云审核通过 时，才允许提交官方
+    if(entity.transfer_status != 'PASS_ALIYUN_VERIFY'){
+      return {
+        status: "-1",
+        msg: "流程状态等于 阿里云审核通过 时，才允许提交官方"
+      }
+    }
+
     var BizId = obj.ali_bizid;
     var obj = {
       action: "SubmittedTransferMaterail",
       reqbody: {
-        BizId: BizId
+        BizId: BizId,
+        TransferOsskey: obj.transfer_receive_ack, // 商标局回执 add
+        AssigneeProxy: obj.seller_proxy, // 受让人委托书 add
       }
     }
-    return await this.aliclient(obj);
+    var rtn =  await this.aliclient(obj);
+    console.log(rtn);
+    return rtn;
   }
 
   //商标局受理

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

@@ -45,12 +45,33 @@
         })
        }
        if(key=='alisubmit'){
-        this.supplymaterail.transfer_status="PROVIDE_MATERIAL";
-        this.$root.postReq("/web/transfer/tradetransferCtl/submit", this.supplymaterail).then(function (d) {
-          if (d.status > -1) {
-            history.go(-1)
-          }
-        })
+        /* 如果当前状态等于 待服务商重新提交资料 ，审核驳回后服务商修改资料后重新提交接口*/
+        if(this.supplymaterail.transfer_status != 'MATERIALS_TO_BE_SUBMITTED'){
+           this.supplymaterail.transfer_status="PROVIDE_MATERIAL";
+           this.$root.postReq("/web/transfer/tradetransferCtl/submit", this.supplymaterail).then(function (d) {
+               if (d.status > -1) {
+                   history.go(-1);
+               }else{
+                   if(d.msg){
+                       self.$message.warning("提交失败:"+d.msg);
+                   }else {
+                       self.$message.warning("提交失败。");
+                   }
+               }
+           })
+        }else{
+           this.$root.postReq("/web/transfer/tradetransferCtl/submit", this.supplymaterail).then(function (d) {
+               if (d.status > -1) {
+                   history.go(-1);
+               }else{
+                   if(d.msg){
+                       self.$message.warning("提交失败:"+d.msg);
+                   }else {
+                       self.$message.warning("提交失败。");
+                   }
+               }
+           })
+        }
        }
     },
     onColFormater(row, column, cellvalue, index){

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

@@ -134,7 +134,11 @@
           }else{
             $("[name='grdid']").show();
             $("[name='frmid']").hide();
-            that.$message.warning("提交失败");
+            if(d.msg){
+              that.$message.warning("提交失败:"+d.msg);
+            }else{
+              that.$message.warning("提交失败");
+            }
           }
         })
       }