wdy

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

@@ -17,13 +17,11 @@ class TmjsonfileCtl extends CtlBase {
     console.log(rtn);
     console.log(rtn);
     if (rtn.status > -1) {
     if (rtn.status > -1) {
       var newdate = new Date();
       var newdate = new Date();
-      var m = newdate.getMonth() + 1;
-      var d = newdate.getDate();
       var strdate = ""
       var strdate = ""
       if (newdate.getHours() > 12) {
       if (newdate.getHours() > 12) {
-        strdate = newdate.getFullYear() + "" + m + d + "_2.json";
+        strdate = newdate.toISOString().split("T")[0].replace(/\-/g, "") + "_2.json";
       } else {
       } else {
-        strdate = newdate.getFullYear() + "" + m + d + "_1.json";
+        strdate = newdate.toISOString().split("T")[0].replace(/\-/g, "") + "_1.json";
       }
       }
       var self = this;;
       var self = this;;
       var gobj = {
       var gobj = {

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

@@ -13,23 +13,34 @@ class TmjsonfileService extends ServiceBase {
   }
   }
 
 
   async createjsonfile() {
   async createjsonfile() {
+    var lastsql = "select * from tm_jsonfile order by id desc limit 1";
+    var lastinfo = await this.dao.customQuery(lastsql);
+    var lasttime=0
+    if(lastinfo){
+      lasttime=lastinfo[0].updated_at.toISOString().split("T")[0];
+    }
+    // var sql = "select * from bi_trademarktransaction where updated_at>='"+lasttime+"'";
     var sql = "select * from bi_trademarktransaction where id=175342";
     var sql = "select * from bi_trademarktransaction where id=175342";
     var tminfos = await this.connectionigirl.query(sql);
     var tminfos = await this.connectionigirl.query(sql);
     var sources = [];
     var sources = [];
     if (tminfos[0]) {
     if (tminfos[0]) {
       for (var i = 0; i < tminfos[0].length; i++) {
       for (var i = 0; i < tminfos[0].length; i++) {
         var tmg = tminfos[0][i].tm_group;
         var tmg = tminfos[0][i].tm_group;
+        var status=1;
+        if(tminfos[0][i].deleted_at||"lowershelf"==tminfos[0][i].publish_status){
+          status=0;
+        }
         var strlist = null;
         var strlist = null;
         if (tmg) {
         if (tmg) {
           strlist = tmg.replace(/"/g, "").replace(/\[/g, "").replace(/\]/g, "").split(",");
           strlist = tmg.replace(/"/g, "").replace(/\[/g, "").replace(/\]/g, "").split(",");
-          for(var n=0;n<strlist.length;n++){
+          for (var n = 0; n < strlist.length; n++) {
             if (!strlist[n]) {
             if (!strlist[n]) {
               strlist.shift();
               strlist.shift();
             }
             }
           }
           }
         }
         }
         var des = "";
         var des = "";
-        if(tminfos[0][i].tm_ncl_third){
+        if (tminfos[0][i].tm_ncl_third) {
           des = tminfos[0][i].tm_ncl_third.replace(/\[/g, "").replace(/\]/g, "").replace(/\'/g, "");
           des = tminfos[0][i].tm_ncl_third.replace(/\[/g, "").replace(/\]/g, "").replace(/\'/g, "");
         }
         }
         var source = {
         var source = {
@@ -38,13 +49,13 @@ class TmjsonfileService extends ServiceBase {
           description: des,
           description: des,
           endTime: 1668089537981,
           endTime: 1668089537981,
           label: "商标标签",
           label: "商标标签",
-          originalPrice:  parseInt(tminfos[0][i].platform_quoted_price) ,
+          originalPrice: parseInt(tminfos[0][i].platform_quoted_price),
           ownerEnName: "",
           ownerEnName: "",
           ownerName: tminfos[0][i].tm_applier,
           ownerName: tminfos[0][i].tm_applier,
           partnerCode: "gong_si_bao",
           partnerCode: "gong_si_bao",
           regAnnDate: tminfos[0][i].tm_regist_day * 1000,
           regAnnDate: tminfos[0][i].tm_regist_day * 1000,
           secondaryClassification: strlist,
           secondaryClassification: strlist,
-          status: 1,
+          status: status,
           thirdClassification: tminfos[0][i].tm_ncl_third,
           thirdClassification: tminfos[0][i].tm_ncl_third,
           tmIcon: tminfos[0][i].pic_url,
           tmIcon: tminfos[0][i].pic_url,
           tmName: tminfos[0][i].name,
           tmName: tminfos[0][i].name,
@@ -53,17 +64,15 @@ class TmjsonfileService extends ServiceBase {
         sources.push(source);
         sources.push(source);
       }
       }
       var newdate = new Date();
       var newdate = new Date();
-      var m = newdate.getMonth() + 1;
-      var d = newdate.getDate();
       var strdate = ""
       var strdate = ""
       if (newdate.getHours() > 12) {
       if (newdate.getHours() > 12) {
-        strdate = newdate.getFullYear() + "" + m + d + "_2.json";
+        strdate = newdate.toISOString().split("T")[0].replace(/\-/g, "") + "_2.json";
       } else {
       } else {
-        strdate = newdate.getFullYear() + "" + m + d + "_1.json";
+        strdate = newdate.toISOString().split("T")[0].replace(/\-/g, "") + "_1.json";
       }
       }
       var jsonstr = JSON.stringify(sources, null, "\t");
       var jsonstr = JSON.stringify(sources, null, "\t");
       return new Promise(function (resv, rej) {
       return new Promise(function (resv, rej) {
-        fs.writeFile('/tmp/'+strdate, jsonstr, function (err) {
+        fs.writeFile('/tmp/' + strdate, jsonstr, function (err) {
           if (err) {
           if (err) {
             console.error(err);
             console.error(err);
           }
           }