Skip to content

Z
zhichan
Commit b8226c3d by 王勇飞
Options

Merge branch 'fqboss' of gitlab.gongsibao.com:jiangyong/zhichan into fqboss

parents 7b895129 63f083cb
Showing with 90 additions and 97 deletions
fqboss/app/base/db/models/trademark.js
......@@ -116,8 +116,9 @@ module.exports = (db, DataTypes) => {
businessId: DataTypes.STRING(50),//业务ID
channelOrderListInfo: DataTypes.STRING(500),//渠道服务单号对应的订单列表信息
channelPric: DataTypes.DECIMAL(12, 2),//渠道商标单个大类的价格
nclCount:DataTypes.INTEGER,
nclPublicExpense:DataTypes.DECIMAL(12, 2),
nclCount: DataTypes.INTEGER,
nclPublicExpense: DataTypes.DECIMAL(12, 2),
principal: DataTypes.STRING(100),//提报主体
}, {
paranoid: true,//假的删除
underscored: true,
......
fqboss/app/base/service/impl/orderSve.js
......@@ -1053,7 +1053,7 @@ class OrderService extends ServiceBase {
"needId": tm.needId || "",
"channelOrderListInfo": nclone.channelOrderListInfo || tm.channelOrderListInfo || "",
"nclCount": nclthreeobjCount,
"principal": apply.principal || "",
};
var trademark = await self.trademarkDao.create(tmobj, t);
}
......@@ -1512,8 +1512,19 @@ class OrderService extends ServiceBase {
var channelorder = obj.channelorder;
var self = this;
var tm = obj.tm;
var apply = obj.apply;
tm["tmSourceType"] = "16";
if (obj.channelCode == "ali_zcsubmit") {
if (!apply.principal) {
result.code = "-95";
result.msg = "提报主体不能为空";
return result;
}
if (["知域互联科技有限公司", "阿里巴巴科技（北京）有限公司"].indexOf(apply.principal) < 0) {
result.code = "-97";
result.msg = "提报主体不正确，请选择正确的提报主体";
return result;
}
tm["tmSourceType"] = "32";
if (!obj.needId) {
result.code = "-100";
......@@ -1522,24 +1533,7 @@ class OrderService extends ServiceBase {
}
tm["needId"] = obj.needId;
}
// else if (obj.channelCode == "1688") {
// tm["tmSourceType"] = "64";
// if (!obj.needId) {
// result.code = "-110";
// result.msg = "1688需求ID不能为空";
// return result;
// }
// tm["needId"] = obj.needId;
// }else if (obj.channelCode == "jd") {
// tm["tmSourceType"] = "128";
// if (!obj.needId) {
// result.code = "-110";
// result.msg = "jd需求ID不能为空";
// return result;
// }
// tm["needId"] = obj.needId;
// }
var judgeRes = self.trademarkDao.judgeChannelCode(obj.channelCode);//判断渠道码
var judgeRes = self.trademarkDao.judgeChannelCode(obj.channelCode);//判断其他渠道码
if (judgeRes) {
tm["tmSourceType"] = judgeRes;
if (!obj.needId) {
......@@ -1550,7 +1544,7 @@ class OrderService extends ServiceBase {
tm["needId"] = obj.needId;
}
tm["channelOrderListInfo"] = channelorder.order_nos && channelorder.order_nos.length > 0 ? channelorder.order_nos.join('，') : "";
var apply = obj.apply;
var user = obj.user;
var app = obj.app;
var nclones = obj.nclones || null;
......@@ -1594,12 +1588,12 @@ class OrderService extends ServiceBase {
}
//获取已提交的商标信息 用作校验重复提交
var oldtms = await this.trademarkDao.model.findAll({
where:{channelOrderNum:obj.channelOrderNum,applyName:apply.applyName,tmName:tm.tmName},
raw:true
where: { channelOrderNum: obj.channelOrderNum, applyName: apply.applyName, tmName: tm.tmName },
raw: true
});
var oldNclOneCodes = [];//已提交商标尼斯集合
if(oldtms && oldtms.length>0){
for(var a=0;a<oldtms.length;a++){
if (oldtms && oldtms.length > 0) {
for (var a = 0; a < oldtms.length; a++) {
var oldtm = oldtms[a];
oldNclOneCodes.push(oldtm.nclOneCodes);
}
......@@ -1608,12 +1602,12 @@ class OrderService extends ServiceBase {
var selectNclThreeCount = 0;
for (let index = 0; index < nclones.length; index++) {
const element = nclones[index];
if(element.code && oldNclOneCodes.length>0){
if(oldNclOneCodes.indexOf(element.code)>=0){
if (element.code && oldNclOneCodes.length > 0) {
if (oldNclOneCodes.indexOf(element.code) >= 0) {
return { code: "-260", msg: "已存在第" + element.code + "类的商标，不能重复提交" };
}
}
var nclList = null;
if (typeof (element) == "string") {
nclList = JSON.parse(element);
......@@ -1788,12 +1782,12 @@ class OrderService extends ServiceBase {
// return checkRes;
// }
// }
if(orderItem.created_at && orderItem.orderSourceType != "8"){
if (orderItem.created_at && orderItem.orderSourceType != "8") {
var time = new Date(orderItem.created_at).getTime();
if(time>1576339199000){//2019-12-14 23:59:59
if (time > 1576339199000) {//2019-12-14 23:59:59
var usable_order_no_class_count = channelorder.usable_order_no_class_count;//有效渠道订单列表
var checkRes = await this.checkChannelUsableOrder(usable_order_no_class_count,nclones);//校验有效订单
if(checkRes.code!=1){
var checkRes = await this.checkChannelUsableOrder(usable_order_no_class_count, nclones);//校验有效订单
if (checkRes.code != 1) {
return checkRes;
}
}
......@@ -1861,7 +1855,7 @@ class OrderService extends ServiceBase {
// if (orderItem.channelCode == "1688" || orderItem.channelCode == "jd") {
// tm["tmStatus"] = "WAITCONFIRM";
// }
var judgeRes = self.trademarkDao.judgeChannelCode(orderItem.channelCode);//判断渠道码
var judgeRes = self.trademarkDao.judgeChannelCode(orderItem.channelCode);//判断其他渠道码
if (judgeRes) {
tm["tmStatus"] = "WAITCONFIRM";
}
......@@ -1880,6 +1874,16 @@ class OrderService extends ServiceBase {
}
tm["tmSourceType"] = "16";
if (orderItem.channelCode == "ali_zcsubmit") {
if (!apply.principal) {
result.code = "-95";
result.msg = "提报主体不能为空";
return result;
}
if (["知域互联科技有限公司", "阿里巴巴科技（北京）有限公司"].indexOf(apply.principal) < 0) {
result.code = "-97";
result.msg = "提报主体不正确，请选择正确的提报主体";
return result;
}
tm["tmSourceType"] = "32";
if (!channelorder.needId) {
result.code = "-150";
......@@ -1888,23 +1892,7 @@ class OrderService extends ServiceBase {
}
tm["needId"] = channelorder.needId;
}
// else if (orderItem.channelCode == "1688") {
// tm["tmSourceType"] = "64";
// if (!channelorder.needId) {
// result.code = "-160";
// result.msg = "1688需求ID不能为空!";
// return result;
// }
// tm["needId"] = channelorder.needId;
// }else if (orderItem.channelCode == "jd") {
// tm["tmSourceType"] = "128";
// if (!channelorder.needId) {
// result.code = "-160";
// result.msg = "jd需求ID不能为空!";
// return result;
// }
// tm["needId"] = channelorder.needId;
// }
if (judgeRes) {
tm["tmSourceType"] = judgeRes;
if (!channelorder.needId) {
......@@ -1955,6 +1943,7 @@ class OrderService extends ServiceBase {
"businessId": oldTmList && oldTmList.length > 0 ? oldTmList[0].businessId : "",
"channelOrderListInfo": nclone.channelOrderListInfo || tm.channelOrderListInfo || "",
"nclCount": nclthreeobjCount,
"principal": apply.principal,
};
// console.log(tmobj);
var trademark = await self.trademarkDao.create(tmobj, t);
......@@ -1998,9 +1987,9 @@ class OrderService extends ServiceBase {
var tms = await self.trademarkDao.model.findAll({ where: { orderNum: order.orderNum }, raw: true });
var tmE = tms[0];
var remainder = channelorder.remainder;
if(tmE && tmE.tmSourceType && tmE.tmSourceType=='64'){//1688渠道不需要判断渠道订单
if (tmE && tmE.tmSourceType && tmE.tmSourceType == '64') {//1688渠道不需要判断渠道订单
tm["channelPayStatus"] = tmE.channelPayStatus;
}else{
} else {
if (!remainder) {
return { code: "-203", msg: "渠道订单产品数量有误" };
} else if (nclones.length > Number(remainder)) {
......
fqboss/app/config/localsettings.js
var settings={
redis:{
var settings = {
redis: {
host: "43.247.184.32",
port: 8967,
password: "Gongsibao2018",
db:11,
db: 11,
},
database:{
dbname : "fqboss",
database: {
dbname: "fqboss",
user: "write",
password: "write",
// user: "root",
......@@ -17,43 +17,43 @@ var settings={
// port: 3306,
port: 8899,
dialect: 'mysql',
operatorsAliases: false,
pool: {
max: 5,
min: 0,
acquire: 90000000,
idle: 1000000
},
debug:false,
dialectOptions:{
requestTimeout: 999999,
// instanceName:'DEV'
} //设置MSSQL超时时间
}
},
// database:{
// dbname : "fqboss",
// user: "write",
// password: "write",
// config: {
// host: '43.247.184.35',
// port: 8899,
// dialect: 'mysql',
// operatorsAliases: false,
// pool: {
// max: 5,
// min: 0,
// acquire: 90000000,
// idle: 1000000
// },
// debug:false,
// dialectOptions:{
// requestTimeout: 999999,
// // instanceName:'DEV'
// } //设置MSSQL超时时间
// }
// },
reqEsDevUrl:"http://43.247.184.94:7200/",
reqHomePageDevUrl:"http://192.168.18.232:3000/"
operatorsAliases: false,
pool: {
max: 5,
min: 0,
acquire: 90000000,
idle: 1000000
},
debug: false,
dialectOptions: {
requestTimeout: 999999,
// instanceName:'DEV'
} //设置MSSQL超时时间
}
},
// database:{
// dbname : "fqboss",
// user: "write",
// password: "write",
// config: {
// host: '43.247.184.35',
// port: 8899,
// dialect: 'mysql',
// operatorsAliases: false,
// pool: {
// max: 5,
// min: 0,
// acquire: 90000000,
// idle: 1000000
// },
// debug:false,
// dialectOptions:{
// requestTimeout: 999999,
// // instanceName:'DEV'
// } //设置MSSQL超时时间
// }
// },
reqEsDevUrl: "http://43.247.184.94:7200/",
reqHomePageDevUrl: "http://192.168.18.232:3000/"
};
module.exports = settings;
module.exports = settings;
\ No newline at end of file
fqboss/app/config/routes/web.js
......@@ -256,6 +256,8 @@ module.exports = function (app) {
req.url.indexOf("userCtl/loginByMobile") > 0 ||
req.url.indexOf("userCtl/checkUserInfo") > 0 ||
req.url.indexOf("metaCtl/getUiConfig") > 0 ||
req.url.indexOf("ncloneCtl/getNcl") > 0 ||
req.url.indexOf("orderCtl/getChannelOrderByOrderNum") > 0 ||
(
req.headers.access_source=="zqq1571212637509" &&
(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment