fix

center-tmtransaction/app/base/service/impl/tm/trademarktransactionSve.js

@@ -310,6 +310,8 @@ class TrademarktransactionService extends ServiceBase {
     for (var i = 0; i < objlist.length; i++) {
     for (var i = 0; i < objlist.length; i++) {
       // 2020 0910 lin 新增 platform_quoted_price = business_quoted_price * 1.2 + 1000
       // 2020 0910 lin 新增 platform_quoted_price = business_quoted_price * 1.2 + 1000
       objlist[i].platform_quoted_price = Number(objlist[i].business_quoted_price) * 1.2 + 1000;
       objlist[i].platform_quoted_price = Number(objlist[i].business_quoted_price) * 1.2 + 1000;
+      delete objlist[i].publish_status
+      delete objlist[i].publish_status_name
       if (objlist[i].id)
       if (objlist[i].id)
         await this.dao.updateByWhere(objlist[i], {where: {id: objlist[i].id}})
         await this.dao.updateByWhere(objlist[i], {where: {id: objlist[i].id}})
       else
       else
@@ -472,7 +474,7 @@ class TrademarktransactionService extends ServiceBase {
     console.log(list);
     console.log(list);
     var result = system.getResultSuccess(list);
     var result = system.getResultSuccess(list);
     for (let i = 0; i < list.length; i++) {
     for (let i = 0; i < list.length; i++) {
-      if (list[i].TmType!=="NORMAL"&&list[i].publish_status==="auditali"){
+      if (list[i].TmType!=="NORMAL"){
          let data = await this.queryAlistatus(list[i].code)
          let data = await this.queryAlistatus(list[i].code)
         if (data.status===1){
         if (data.status===1){
           list[i].publish_status="ON_SALE"
           list[i].publish_status="ON_SALE"
@@ -513,7 +515,7 @@ class TrademarktransactionService extends ServiceBase {
       if (res[0].Status==1)
       if (res[0].Status==1)
         return {status:1}
         return {status:1}
       else
       else
-        return {status:0,fail_reason:JSON.stringify(res[0])}
+        return {status:0,fail_reason:res[0].AuditResult}
     }else
     }else
       return {status:9}
       return {status:9}
   }
   }
@@ -763,8 +765,13 @@ class TrademarktransactionService extends ServiceBase {
     for (const item of res) {
     for (const item of res) {
       let obj = buildobj(item,status)
       let obj = buildobj(item,status)
       if (obj) {
       if (obj) {
+        let action = "UpdateTrademarkOnsale"
+        if (["audit","fail"].includes(item.publish_status))
+          action = "UploadTrademarkOnSale"
+        if (item.TmType !== "NORMAL"&&item.publish_status==="fail")
+          action = "UpdateTrademarkOnsale"
         err = await reqbyget({
         err = await reqbyget({
-          action:["audit","fail"].includes(item.publish_status)?"UploadTrademarkOnSale":"UpdateTrademarkOnsale",
+          action,
           reqbody: obj
           reqbody: obj
         })
         })
         await this.sleep()
         await this.sleep()