Merge branch 'gsb-marketplat' of gitlab.gongsibao.com:jiangyong/zhichan into gsb-marketplat

gsb-marketplat/app/base/service/impl/template/templatelinkSve.js

@@ -308,30 +308,33 @@ class TemplatelinkService extends ServiceBase {
       return system.getResultFail(-112,"投放终端参数不能为空");
       return system.getResultFail(-112,"投放终端参数不能为空");
     }
     }
     var linkObj = {
     var linkObj = {
+      is_enabled:1,
       template_id:ab.template_id,channel_code:ab.channel_code,else_channel_param:ab.else_channel_param,
       template_id:ab.template_id,channel_code:ab.channel_code,else_channel_param:ab.else_channel_param,
       business_type_code:ab.business_type_code,lauch_type_code:ab.lauch_type_code,
       business_type_code:ab.business_type_code,lauch_type_code:ab.lauch_type_code,
       marketing_subject_code:ab.marketing_subject_code
       marketing_subject_code:ab.marketing_subject_code
     };
     };
     //获取链接数据
     //获取链接数据
     var linkinfo = await this.dao.model.findOne({
     var linkinfo = await this.dao.model.findOne({
+      attributes:["code"],
       where:linkObj,raw:true
       where:linkObj,raw:true
     });
     });
-    if(!linkinfo || !linkinfo.id){
-      return system.getResultFail(-300,"未知链接");
+    if(!linkinfo || !linkinfo.code){
+      return system.getResultFail(-300,"未知链接或链接未投放");
     }
     }
-    if(!linkinfo.is_enabled || linkinfo.is_enabled!==1){
-      return system.getResultFail(-301,"无效链接，该链接未投放");
-    }
-    var tempObj={id:ab.template_id};
+    // if(!linkinfo.is_enabled || linkinfo.is_enabled!==1){
+    //   return system.getResultFail(-301,"无效链接，该链接未投放");
+    // }
+    var tempObj={id:ab.template_id,is_enabled:1};
     var templateinfo = await this.templateinfoDao.model.findOne({
     var templateinfo = await this.templateinfoDao.model.findOne({
+      attributes:["title","keyword","describe","pic_url","template_content"],
       where:tempObj,raw:true
       where:tempObj,raw:true
     });
     });
-    if(!templateinfo || !templateinfo.id){
-      return system.getResultFail(-400,"未知模板");
-    }
-    if(!templateinfo.is_enabled || templateinfo.is_enabled!==1){
-      return system.getResultFail(-401,"无效模板，该模板未启用");
+    if(!templateinfo){
+      return system.getResultFail(-400,"未知模板或模板未启用");
     }
     }
+    // if(!templateinfo.is_enabled || templateinfo.is_enabled!==1){
+    //   return system.getResultFail(-401,"无效模板，该模板未启用");
+    // }
     var resultObj = {
     var resultObj = {
       templateinfo:templateinfo,linkinfo:linkinfo
       templateinfo:templateinfo,linkinfo:linkinfo
     };
     };