fix

zhiquanquan/app/base/controller/impl/trademark/trademarkCtl.js

@@ -123,6 +123,7 @@ class TrademarkCtl extends CtlBase {
             return system.getResultFail(-2, e)
             return system.getResultFail(-2, e)
         }
         }
     }
     }
+
     //接受队列消息，解析excel
     //接受队列消息，解析excel
     async process(p, q, req) {
     async process(p, q, req) {
         let fileurl = p.actionBody.file_url;
         let fileurl = p.actionBody.file_url;
@@ -134,9 +135,9 @@ class TrademarkCtl extends CtlBase {
         let filename = sp[sp.length - 1];
         let filename = sp[sp.length - 1];
         await this.restClient.execDownload(fileurl, filename);
         await this.restClient.execDownload(fileurl, filename);
         let list = xlsx.parse(filename);
         let list = xlsx.parse(filename);
-        let data =[];
+        let data = [];
         list[0].data.shift();
         list[0].data.shift();
-        list[0].data.forEach(item=>{
+        list[0].data.forEach(item => {
             if (item.length > 0) {
             if (item.length > 0) {
                 data.push({
                 data.push({
                     name: item[0],
                     name: item[0],
@@ -154,12 +155,12 @@ class TrademarkCtl extends CtlBase {
         await upload.save();
         await upload.save();
         for (let i = 0; i < data.length; i += 20) {
         for (let i = 0; i < data.length; i += 20) {
             let item = data.slice(i, i + 20);
             let item = data.slice(i, i + 20);
-            item.forEach(e=>{
+            item.forEach(e => {
                 e.channel_code = p.actionBody.company_id;
                 e.channel_code = p.actionBody.company_id;
                 e.channel_name = p.actionBody.channel_name;
                 e.channel_name = p.actionBody.channel_name;
             });
             });
             let pushd = {
             let pushd = {
-                data:item
+                data: item
             };
             };
             pushd.opath = p.actionBody.opath;
             pushd.opath = p.actionBody.opath;
             pushd.userid = p.actionBody.userid;
             pushd.userid = p.actionBody.userid;
@@ -169,6 +170,7 @@ class TrademarkCtl extends CtlBase {
         }
         }
         return system.getResult(1, "ok")
         return system.getResult(1, "ok")
     }
     }
+
     /**
     /**
      * @api {post} /web/trademark/trademarkCtl/excelpublish 上传excel
      * @api {post} /web/trademark/trademarkCtl/excelpublish 上传excel
      * @apiGroup 标源管理
      * @apiGroup 标源管理
@@ -222,6 +224,7 @@ class TrademarkCtl extends CtlBase {
         let data = JSON.parse(rtn.stdout);
         let data = JSON.parse(rtn.stdout);
         return system.getResult(data.data)
         return system.getResult(data.data)
     }
     }
+
     /**
     /**
      * @api {post} /web/trademark/trademarkctl/updatestatus 修改状态
      * @api {post} /web/trademark/trademarkctl/updatestatus 修改状态
      * @apiDescription (下架/审核/状态修改)
      * @apiDescription (下架/审核/状态修改)
@@ -237,8 +240,8 @@ class TrademarkCtl extends CtlBase {
         let body = {
         let body = {
             "actionType": "tmStatusUpdate",
             "actionType": "tmStatusUpdate",
             "actionBody": {
             "actionBody": {
-                tm:p.data,
-                status:p.status
+                tm: p.data,
+                status: p.status
             }
             }
         };
         };
         let rtn = await this.execClient.execPost(body, tmurl);
         let rtn = await this.execClient.execPost(body, tmurl);
@@ -304,8 +307,9 @@ class TrademarkCtl extends CtlBase {
                 id: upload_id
                 id: upload_id
             });
             });
             upload.success += p.actionBody.resultInfo.data.successCount || 0;
             upload.success += p.actionBody.resultInfo.data.successCount || 0;
-            upload.fail = upload.total - upload.success;
-            upload.status = 1;
+            upload.fail += p.actionBody.resultInfo.data.failCount || 0;
+            if (upload.total <= upload.success + upload.fail)
+                upload.status = 1;
             await upload.save();
             await upload.save();
         }
         }
         let tradedb = p.actionBody.resultInfo.data.tm;
         let tradedb = p.actionBody.resultInfo.data.tm;
@@ -315,7 +319,7 @@ class TrademarkCtl extends CtlBase {
                 tm_code: db.code
                 tm_code: db.code
             }, {where: {tm_code: db.code}});
             }, {where: {tm_code: db.code}});
         });
         });
-        return system.getResult(1,"ok")
+        return system.getResult(1, "ok")
     }
     }
 }
 }