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

gsb-marketplat/app/base/db/models/configmag/launchchannel.js

@@ -6,6 +6,7 @@
  */
  */
 module.exports = (db, DataTypes) => {
 module.exports = (db, DataTypes) => {
     return db.define("launchchannel", {
     return db.define("launchchannel", {
+        only_code:DataTypes.STRING(255),//渠道唯一码
         code: DataTypes.STRING(100),//表单编码
         code: DataTypes.STRING(100),//表单编码
         name: DataTypes.STRING(100),//表单名称
         name: DataTypes.STRING(100),//表单名称
         notes: DataTypes.STRING(255),//备注
         notes: DataTypes.STRING(255),//备注

gsb-marketplat/app/base/db/models/media/needinfo.js

@@ -17,6 +17,7 @@ module.exports = (db, DataTypes) => {
               this.setDataValue("submit_type_name",submit_type[val]);
               this.setDataValue("submit_type_name",submit_type[val]);
             }
             }
         },
         },
+        channel_only_code:DataTypes.STRING,//渠道编码
         channel_code:DataTypes.STRING,//渠道编码
         channel_code:DataTypes.STRING,//渠道编码
         channel_name:DataTypes.STRING,//渠道名称
         channel_name:DataTypes.STRING,//渠道名称
         page_code:DataTypes.STRING,//页面编码
         page_code:DataTypes.STRING,//页面编码

gsb-marketplat/app/base/service/impl/media/needinfoSve.js

@@ -47,13 +47,14 @@ class NeedinfoService extends ServiceBase {
             return system.getResultFail(-107,"联系电话不能为空！")
             return system.getResultFail(-107,"联系电话不能为空！")
         }
         }
         var channel = await this.launchchannelDao.model.findOne({
         var channel = await this.launchchannelDao.model.findOne({
-            attributes:["code","name"],
+            attributes:["code","name","only_code"],
             where:{code:ab.channel_code},raw:true
             where:{code:ab.channel_code},raw:true
         });
         });
         if(!channel || !channel.code){
         if(!channel || !channel.code){
             return system.getResultFail(-300,"渠道信息不存在")
             return system.getResultFail(-300,"渠道信息不存在")
         }
         }
         ab["channel_name"] = channel.name;
         ab["channel_name"] = channel.name;
+        ab["channel_only_code"] = channel.only_code || "";
         return ab;
         return ab;
     }
     }
     //推送需求至队列
     //推送需求至队列