Skip to content

Z
zhichan
Commit 980956a8 by 宋毅
Options

git Merge branch 'center-order' of gitlab.gongsibao.com:jiangyong/zhichan into center-order

parents 32ee8847 9c3989e6
Showing with 131 additions and 12 deletions
center-order/app/base/api/impl/action/icpapi.js
......@@ -48,6 +48,9 @@ class IcpAPI extends APIBase {
case "getIcpProgrammeDetail"://获取icp方案
opResult = await this.needsolutionSve.getIcpProgrammeDetail(pobj);
break;
case "getNeedSolutionDetailByUser"://获取方案详情
opResult = await this.needsolutionSve.getNeedSolutionDetailByUser(pobj);
break;
// case "updateStausByRefundOrder"://修改退款方案状态
// opResult = await this.needsolutionSve.updateStausByRefundOrder(pobj);
// break;
......
center-order/app/base/api/impl/action/order.js
......@@ -49,6 +49,9 @@ class OrderAPI extends APIBase {
case "delOrder"://删除订单
opResult = await this.orderinfoSve.delOrder(pobj, pobj.actionBody);
break;
case "channeldelOrder"://阿里工商注册退款
opResult = await this.orderinfoSve.channeldelOrder(pobj, pobj.actionBody);
break;
//--------------------------------支付相关接口------------开始
case "getPayOrderInfo"://获取付款订单信息
opResult = await this.orderinfoSve.getPayOrderInfo(pobj, pobj.actionBody);
......
center-order/app/base/db/impl/dbcorder/orderinfoDao.js
......@@ -42,5 +42,12 @@ class OrderInfoDao extends Dao {
};
return await this.delete(sqlWhere);
}
async channeldelOrder(channelOrderNo, uapp_id) {
var sqlWhere = {
channelOrderNo: channelOrderNo,
uapp_id: uapp_id,
};
return await this.delete(sqlWhere);
}
}
module.exports = OrderInfoDao;
center-order/app/base/service/impl/dbneed/needsolutionSve.js
......@@ -9,6 +9,12 @@ class NeedsolutionService extends ServiceBase {
this.needinfoDao = system.getObject("db.dbneed.needinfoDao");
// this.push2aliSve = system.getObject("service.common.push2aliSve");
this.orderinfoDao = system.getObject("db.dbcorder.orderinfoDao");
this.icpSolutionStatusReference={
UN_PAID:"未支付",PAID:"用户支付",USER_UPLOADED:"用户上传资料",MATERIAL_UNCONFIRM:"服务商递交⽂件"
,USER_CONFIRMED:"⽤户已确认递交⽂件",ACCOUNT_REGISTERED:"完成账户注册",MATERIAL_SUBMITTED:"完成资料递交",
GXB_ACCEPT:"⼯信部已受理",GXB_REFUSE:"⼯信部不予受理",GXB_FAIL:"⼯信部未通过",GXB_SUCCESS:"工信部通过"
,CLOSE:"方案关闭"
};
}
//---------------------公司注册-start-----------------------------------------------------------------
//提交方案
......@@ -558,8 +564,10 @@ class NeedsolutionService extends ServiceBase {
if(!needinfo.channelTypeCode){
return system.getResultFail(-206,"渠道方案类型错误");
}
ab.solutionContent.typeCode=needinfo.typeCode;
ab.solutionContent.typeName=needinfo.typeName;
var ns = await this.dao.model.findAll({
where:{needNo:ab.needNo},raw:true
where:{channelNeedNo:ab.needNo},raw:true
});
for(var i=0;i<ns.length;i++){
var fa = ns[i];
......@@ -567,8 +575,8 @@ class NeedsolutionService extends ServiceBase {
return system.getResultFail(-207,"需求方案已存在，不能重复提交");
}
}
ab.solutionContent.bizType=needinfo.channelTypeCode;
bizType =needinfo.channelTypeCode;
// ab.solutionContent.bizType=needinfo.channelTypeCode;
// bizType =needinfo.channelTypeCode;
if(!ab.solutionContent.solution){
return system.getResultFail(-104,"业务方案信息不能为空");
}
......@@ -794,6 +802,12 @@ class NeedsolutionService extends ServiceBase {
return system.getResultFail(-107,"合作方递交其他供预览文件不能为空");
}
solutionContent.material = ab.material;
var solutionFlowList = solutionContent.solutionFlowList || [];
solutionFlowList.push({
status:"MATERIAL_UNCONFIRM",statusName:this.icpSolutionStatusReference.MATERIAL_UNCONFIRM,updated_at:new Date()
});
solutionContent.status = "MATERIAL_UNCONFIRM";
solutionContent.statusName = this.icpSolutionStatusReference.MATERIAL_UNCONFIRM;
needsolutioninfo.solutionContent = JSON.stringify(solutionContent);
var self = this;
return await this.db.transaction(async function (t) {
......@@ -805,7 +819,7 @@ class NeedsolutionService extends ServiceBase {
})
}
//通知状态变更
//服务商通知状态变更
async acceptIcpPartnerNotification(pobj){
var ab = pobj.actionBody;
var user = pobj.userInfo;
......@@ -844,14 +858,65 @@ class NeedsolutionService extends ServiceBase {
return system.getResultFail(-202,"该方案需求状态为"+needinfo.statusName+",不能执行此操作");
}
var applicationStatusList = solutionContent.applicationStatusList || [];
var solutionFlowList = solutionContent.solutionFlowList || [];
var statusObj={
"OfficialFileURL":ab.OfficialFileURL || "",
"ApplicationStatus":ab.ApplicationStatus,
"ApplicationStatus":ab.ApplicationStatus,
"ApplicationStatusName":ab.ApplicationStatus,
"created_at":new Date()
};
applicationStatusList.push(statusObj);
solutionContent.applicationStatusList = applicationStatusList;
// solutionContent.status = ab.ApplicationStatus;
if(ab.ApplicationStatus==507){//完成账户注册
solutionFlowList.push({
status:"ACCOUNT_REGISTERED",statusName:this.icpSolutionStatusReference.ACCOUNT_REGISTERED,updated_at:new Date()
});
solutionContent.status = "ACCOUNT_REGISTERED";
solutionContent.statusName = this.icpSolutionStatusReference.ACCOUNT_REGISTERED;
// this.icpSolutionStatusReference={
// UN_PAID:"未支付",PAID:"用户支付",USER_UPLOADED:"用户上传资料",MATERIAL_UNCONFIRM:"服务商递交⽂件"
// ,USER_CONFIRMED:"⽤户已确认递交⽂件",ACCOUNT_REGISTERED:"完成账户注册",MATERIAL_SUBMITTED:"完成资料递交",
// GXB_ACCEPT:"⼯信部已受理",GXB_REFUSE:"⼯信部不予受理",GXB_FAIL:"⼯信部未通过"
// ,CLOSE:"方案关闭"
// };
}
if(ab.ApplicationStatus==508){//"服务商完成提交资料到⼯信部
solutionFlowList.push({
status:"MATERIAL_SUBMITTED",statusName:this.icpSolutionStatusReference.MATERIAL_SUBMITTED,updated_at:new Date()
});
solutionContent.status = "MATERIAL_SUBMITTED";
solutionContent.statusName = this.icpSolutionStatusReference.MATERIAL_SUBMITTED;
}
if(ab.ApplicationStatus==509){//⼯商部已受理
solutionFlowList.push({
status:"GXB_ACCEPT",statusName:this.icpSolutionStatusReference.GXB_ACCEPT,updated_at:new Date()
});
solutionContent.status = "GXB_ACCEPT";
solutionContent.statusName = this.icpSolutionStatusReference.GXB_ACCEPT;
}
if(ab.ApplicationStatus==510){//⼯商部不予受理
solutionFlowList.push({
status:"GXB_REFUSE",statusName:this.icpSolutionStatusReference.GXB_REFUSE,updated_at:new Date()
});
solutionContent.status = "GXB_REFUSE";
solutionContent.statusName = this.icpSolutionStatusReference.GXB_REFUSE;
}
if(ab.ApplicationStatus==511){//⼯商部通过
solutionFlowList.push({
status:"GXB_SUCCESS",statusName:this.icpSolutionStatusReference.GXB_SUCCESS,updated_at:new Date()
});
needsolutioninfo.status="ywc";
solutionContent.status = "GXB_SUCCESS";
solutionContent.statusName = this.icpSolutionStatusReference.GXB_SUCCESS;
}
if(ab.ApplicationStatus==512){//⼯信部未通过
solutionFlowList.push({
status:"GXB_FAIL",statusName:this.icpSolutionStatusReference.GXB_FAIL,updated_at:new Date()
});
solutionContent.status = "GXB_FAIL";
solutionContent.statusName = this.icpSolutionStatusReference.GXB_FAIL;
}
solutionContent.solutionFlowList = solutionFlowList;
needsolutioninfo.solutionContent = JSON.stringify(solutionContent);
var self = this;
return await this.db.transaction(async function (t) {
......@@ -909,7 +974,7 @@ class NeedsolutionService extends ServiceBase {
async confirmIcpIntention(pobj){
return system.getResultFail();
}
//接收方案状态变更通知
//接收渠道方案状态变更通知
async receiveIcpStatusNotify(pobj){
var ab = pobj.actionBody;
if(!ab.BizId){
......@@ -938,7 +1003,31 @@ class NeedsolutionService extends ServiceBase {
return system.getResultFail(-103,"方案状态错误，只能废弃待确认方案");
}
var solutionContent = ns.solutionContent;
solutionContent.status = ab.status;
//方案流程列表
var solutionFlowList = solutionContent.solutionFlowList || [];
if(ab.status=="2"){//⽤户已上传
solutionFlowList.push({
status:"USER_UPLOADED",statusName:this.icpSolutionStatusReference.USER_UPLOADED,updated_at:new Date()
});
solutionContent.status = "USER_UPLOADED";
solutionContent.statusName = this.icpSolutionStatusReference.USER_UPLOADED;
}
if(ab.status=="4"){//⽤户已确认
solutionFlowList.push({
status:"USER_CONFIRMED",statusName:this.icpSolutionStatusReference.USER_CONFIRMED,updated_at:new Date()
});
solutionContent.status = "USER_CONFIRMED";
solutionContent.statusName = this.icpSolutionStatusReference.USER_CONFIRMED;
}
if(ab.status=="11"){//⽅案已关闭
solutionFlowList.push({
status:"CLOSE",statusName:this.icpSolutionStatusReference.CLOSE,updated_at:new Date()
});
solutionContent.status = "CLOSE";
solutionContent.statusName = this.icpSolutionStatusReference.CLOSE;
}
solutionContent.solutionFlowList = solutionFlowList;
var material = solutionContent.material || {};
if(ab.remark){
solutionContent.notes = ab.remark;
......@@ -968,9 +1057,10 @@ class NeedsolutionService extends ServiceBase {
};
if(ab.status == "11"){//⽅案已关闭
updateObj["status"]="yzf";
}else if(ab.status == "2" || ab.status == "4"){ //2, "⽤户已上传" 4, "⽤户已确认"
updateObj["status"]="dqr";
}
// else if(ab.status == "2" || ab.status == "4"){ //2, "⽤户已上传" 4, "⽤户已确认"
// updateObj["status"]="dqr";
// }
await this.dao.update(updateObj);//方案状态修改
ns = await this.dao.model.findOne({
where:{channelSolutionNo: ab.BizId},raw:true
......@@ -1028,19 +1118,35 @@ class NeedsolutionService extends ServiceBase {
await this.dao.update(updateObj);//方案状态修改
return system.getResultSuccess();
}
//
//获取方案详情（内部调用）
async getIcpProgrammeDetail(pobj){
var ab = pobj.actionBody;
if(!ab.BizId){
return system.getResultFail(-101,"方案编号不能为空");
}
//获取方案信息
var ns = await this.dao.model.findAll({
where:{channelSolutionNo:ab.BizId},raw:true
});
return system.getResultSuccess(ns);
}
//获取方案详情（前端调用）
async getNeedSolutionDetailByUser(pobj){
var ab = pobj.actionBody;
var user = pobj.userInfo;
if(!user || !user.id){
return system.getResultFail(-100,"未知用户");
}
// ab["createUserId"]=user.id;
if(!ab.solutionNo){
return system.getResultFail(-101,"方案编号不能为空");
}
//获取方案信息
var ns = await this.dao.model.findAll({
where:{solutionNo:ab.solutionNo,createUserId:user.id},raw:true
});
return system.getResultSuccess(ns);
}
//---------------------icp注册-end-----------------------------------------------------------------
......
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