Commit d83d6579 by 庄冰

商标方案确认、关闭

parent b9624167
...@@ -18,5 +18,15 @@ class OpNeedSolution extends APIBase { ...@@ -18,5 +18,15 @@ class OpNeedSolution extends APIBase {
async nbtzreceiveEditAssistTmData(pobj, qobj, req) { async nbtzreceiveEditAssistTmData(pobj, qobj, req) {
return await this.internalCallsNotifySve.receiveEditAssistTmSolutionData(pobj); return await this.internalCallsNotifySve.receiveEditAssistTmSolutionData(pobj);
} }
//提交方案确认
async submitTmConfirm(pobj, qobj, req) {
return await this.internalCallsNotifySve.submitTmConfirm(pobj);
}
/**
* 关闭注册⽅案
*/
async closeSolution(pobj,obj,req){
return await this.internalCallsNotifySve.closeSolution(pobj);
}
} }
module.exports = OpNeedSolution; module.exports = OpNeedSolution;
\ No newline at end of file
...@@ -205,6 +205,11 @@ class InternalCallsNotifyService { ...@@ -205,6 +205,11 @@ class InternalCallsNotifyService {
if (ns) { if (ns) {
return system.getResult(null, "保存商标方案信息失败,存在重复方案信息,不能重复提交,10300"); return system.getResult(null, "保存商标方案信息失败,存在重复方案信息,不能重复提交,10300");
} }
//方案流程
var flowList=[{
date:new Date(),flowName:"提交方案"
}];
pobj.flowList = flowList;
var nsObj = { var nsObj = {
needNo:needInfo.needNo,channelNeedNo:needInfo.channelNeedNo,solutionNo:pobj.proxyCode,orderNo:pobj.serviceNo, needNo:needInfo.needNo,channelNeedNo:needInfo.channelNeedNo,solutionNo:pobj.proxyCode,orderNo:pobj.serviceNo,
solutionContent:JSON.stringify(pobj) solutionContent:JSON.stringify(pobj)
...@@ -230,6 +235,20 @@ class InternalCallsNotifyService { ...@@ -230,6 +235,20 @@ class InternalCallsNotifyService {
if (!ns) { if (!ns) {
return system.getResult(null, "渠道方案号:"+pobj.BizId+"的方案不存在,10300"); return system.getResult(null, "渠道方案号:"+pobj.BizId+"的方案不存在,10300");
}else{ }else{
var flowObj={
date:new Date(),flowName:"方案修改"
};
var oldSolutionContent = ns.solutionContent;
if(oldSolutionContent){
if(typeof oldSolutionContent === 'string'){
oldSolutionContent = JSON.parse(oldSolutionContent)
}
var flowList = oldSolutionContent.flowList || [];
flowList.push(flowObj);
pobj.flowList = flowList;
}else{
pobj.flowList = [flowObj];
}
var nsUpdateObj = { var nsUpdateObj = {
id:ns.id,solutionNo:pobj.proxyCode, id:ns.id,solutionNo:pobj.proxyCode,
solutionContent:JSON.stringify(pobj) solutionContent:JSON.stringify(pobj)
...@@ -286,5 +305,83 @@ class InternalCallsNotifyService { ...@@ -286,5 +305,83 @@ class InternalCallsNotifyService {
} }
return uuid.join(''); return uuid.join('');
} }
//提交方案确认
async submitTmConfirm(pobj) {
if (!pobj.IntentionBizId) {
return self.getResultFail("IntentionBizId不能为空");
}
//获取方案信息
var nsList = await this.needsolutionDao.model.findAll({
attributes:["id","status","solutionContent"],
where:{channelNeedNo:pobj.IntentionBizId}
});
if (!nsList || nsList.length<1) {
return system.getResult(null, "渠道需求号:"+pobj.IntentionBizId+"的方案不存在,10300");
}else{
var flowObj={
date:new Date(),flowName:"提交确认注册⽅案,待用户确认"
};
await this.db.transaction(async function (t) {
for(var i=0;i<nsList.length;i++){
var ns = nsList[i];
if(ns && ns.id){
if(ns.solutionContent){
if(typeof ns.solutionContent === 'string'){
ns.solutionContent = JSON.parse(ns.solutionContent)
}
var flowList = ns.solutionContent.flowList || [];
flowList.push(flowObj);
ns.solutionContent.flowList = flowList;
}else{
ns.solutionContent={};
ns.solutionContent.flowList = [flowObj];
}
ns.solutionContent = JSON.stringify(ns.solutionContent);
await this.needsolutionDao.update(ns,t);
}
}
})
return system.getResultSuccess();
}
}
/**
* 关闭注册⽅案
*/
async closeSolution(pobj){
if (!pobj.BizId) {
return system.getResult(null, "BizId不能为空");
}
if (!pobj.IntentionBizId) {
return self.getResultFail("IntentionBizId不能为空");
}
//获取方案信息
var ns = await this.needsolutionDao.model.findOne({
attributes:["id","status","solutionContent"],
where:{channelNeedNo:pobj.IntentionBizId,channelSolutionNo:pobj.BizId}
});
if (!ns) {
return system.getResult(null, "渠道方案号:"+pobj.BizId+"的方案不存在,10300");
}else{
var flowObj={
date:new Date(),flowName:"关闭方案"
};
if(ns.solutionContent){
if(typeof ns.solutionContent === 'string'){
ns.solutionContent = JSON.parse(ns.solutionContent)
}
var flowList = ns.solutionContent.flowList || [];
flowList.push(flowObj);
ns.solutionContent.flowList = flowList;
}else{
ns.solutionContent.flowList = [flowObj];
}
ns.solutionContent = JSON.stringify(ns.solutionContent);
ns.status="yzf";
await this.needsolutionDao.update(ns);
return system.getResultSuccess();
}
}
} }
module.exports = InternalCallsNotifyService; module.exports = InternalCallsNotifyService;
\ No newline at end of file
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