Skip to content

Z
zhichan
Commit c64e897e by 王勇飞
Options

gyq

parent 9cf7636e
Showing with 655 additions and 331 deletions
ic-deliver/app/base/controller/impl/bizchance/bizoptCtl.js
......@@ -9,7 +9,9 @@ class BizOptCtl extends CtlBase {
constructor() {
super("bizchance", CtlBase.getServiceName(BizOptCtl));
this.schemeService = system.getObject("service.bizchance.schemeSve");
this.receiveUrl = "http://192.168.1.140:4011/api/receive/entService/springBoard";
this.logService = system.getObject("service.bizchance.statuslogSve");
this.receiveUrl = "http://192.168.1.128:4011/api/receive/entService/springBoard";
this.queueUrl = "http://192.168.1.128:4018/api/queueAction/producer/springBoard";
}
/*根据用户id获取商机信息，分页获取*/
......@@ -98,20 +100,37 @@ class BizOptCtl extends CtlBase {
}
/*根据商机编号更新商机状态*/
async updateStatusByDemandCode(pobj,qobj,req){//关闭需求时调用
async updateStatusByDemandCode(pobj,qobj,req){
if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.currentStatus && pobj.currentStatus != 'undefined'){
try{
var res = await this.service.updateStatusByDemandCode(pobj);
await this.service.updateStatusByDemandCode(pobj);
await this.schemeService.updateStatusByDemandCode(pobj);//同时更新方案的状态
//如果商机状态为关闭，需要回传给商城
if (pobj.currentStatus == "isClosed"){
var res = this.service.findInfoByDemandCode(pobj);
if (res && res != 'undefined'){
var logInfo = {
"flowType":"BIZ",
"flowId":res.id,
"statusCode":pobj.currentStatus,
"statusReason":res.close_reason,
"clerkName":res.salesman_name,
"clerkId":res.salesman_id
}
await this.logService.insertInfo(logInfo);//插入状态日至表
}
if (pobj.currentStatus == "isClosed"){ //关闭需求时调用
var rc = system.getObject("util.execClient");
var requrl = this.receiveUrl;
var requrl = this.queueUrl;
var params = {
"actionType":"closeNeed",
"actionType":"produceData",
"actionBody":{
"needNum": pobj.businessMode,
"note":pobj.statusReason
"pushUrl":this.receiveUrl,
"actionType":"closeNeed",
"identifyCode":"ic-manage",
"messageBody":{
"needNum": pobj.businessMode,
"note":pobj.statusReason
}
}
}
var rtn = await rc.execPost(params, requrl);
......@@ -138,8 +157,23 @@ class BizOptCtl extends CtlBase {
if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.businessType && pobj.businessType != 'undefined'){
try{
pobj.currentStatus = "beforeSubmission";//加上当前状态为待提交方案
await this.service.insertInfo(pobj);
return system.getResult("插入成功！");
pobj.channelSource = "tencentCloud";//目前渠道只有腾讯
pobj.sourceNumber = "1111111";
var buInfo = await this.service.insertInfo(pobj);
var logInfo = {
"flowType":"BIZ",
"flowId":buInfo.id,
"statusCode":pobj.currentStatus,
"clerkName":pobj.clerkName,
"clerkId":pobj.salesmanId
}
await this.logService.insertInfo(logInfo);//插入状态日至表
return {
"status":1, //1代表成功，否则失败
"message":"操作成功",
"data":"",
"requestId":""
};
}
catch(error){
......
ic-deliver/app/base/controller/impl/bizchance/cacheinfoCtl.js
......@@ -50,24 +50,24 @@ class CacheInfoCtl extends CtlBase {
/*插入或更新缓存信息 */
async createInfo(pobj,qobj,req){
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.cacheInfo && pobj.cacheInfo != 'undefined'){
try{
var rs = await this.service.findInfoByDeliverId(pobj);
if (rs){
await this.service.updateInfoByDeliverId(pobj);
}
else{
await this.service.insertInfo(pobj);
}
return system.getResult("操作成功！");
try{
var rs = await this.service.findInfoByDeliverId(pobj);
if (rs){
await this.service.updateInfoByDeliverId(pobj);
}
catch (error){
return system.getResultError(error);
else{
await this.service.insertInfo(pobj);
}
return system.getResult("操作成功！");
}
else{
return system.getResultError("参数错误!");
catch (error){
return system.getResultError(error);
}
}
else{
return system.getResultError("参数错误!");
}
}
timeFormat(date) {
......
ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
......@@ -9,7 +9,10 @@ class DeliverybillCtl extends CtlBase {
constructor() {
super("bizchance", CtlBase.getServiceName(DeliverybillCtl));
this.materialService = system.getObject("service.bizchance.materialSve");
this.receiveUrl = "http://192.168.1.140:4011/api/receive/entService/springBoard";
this.schemeService = system.getObject("service.bizchance.schemeSve");
this.logService = system.getObject("service.bizchance.statuslogSve");
this.receiveUrl = "http://192.168.1.128:4011/api/receive/entService/springBoard";
this.queueUrl = "http://192.168.1.128:4018/api/queueAction/producer/springBoard";
}
/*根据用户id获取商机信息，分页获取*/
......@@ -30,32 +33,34 @@ class DeliverybillCtl extends CtlBase {
robj.servicerName = element.facilitator_name;
robj.baseInfo = element.delivery_info;//交付单详情
robj.payStatus = element.delivery_info.payStatus;//交付状态
robj.costPrice = element.cost_price;//成本
robj.settleStatus=element.settle_status;
if (robj.businessName == '公司注册'){
if (robj.baseInfo.isWhether == "是" || robj.baseInfo.isVirtual == "是"){//如果有刻章需求或者是虚拟地址
robj.costPrice = this.FenToYuan(element.cost_price);//成本
robj.settleStatus = element.settle_status;
if (robj.businessName == '公司注册') {
if (robj.baseInfo.isWhether == "是" || robj.baseInfo.isVirtual == "是") {//如果有刻章需求或者是虚拟地址
robj.relatedProducts = '有';
}
else{
else {
robj.relatedProducts = '无';
}
}
else if (robj.businessName == '云上园区注册'){
else if (robj.businessName == '云上园区注册') {
robj.registeredType = element.delivery_info.registeredType;//园区注册时，根据该值跳界面
if (robj.baseInfo.isWhether == "是"){//如果有刻章需求或者是虚拟地址
if (robj.baseInfo.isWhether == "是") {//如果有刻章需求或者是虚拟地址
robj.relatedProducts = '有';
}
else{
else {
robj.relatedProducts = '无';
}
}
else{
else {
robj.relatedProducts = '无';
};
robj.payAmount = element.selling_price;//交付单金额
robj.payAmount = this.FenToYuan(element.selling_price);//交付单金额
robj.deliverStatus = element.delivery_status;//交付单状态
robj.contactsName = robj.baseInfo.contactsName;//联系人
robj.contactsPhone = robj.baseInfo.contactsPhone;//联系电话
robj.clerkName = element.salesman_name;//业务员名称
robj.clerkPhone = element.salesman_phone;//业务员电话
robj.createdTime = this.timeFormat(element.created_at);//交付单创建时间
rarr.push(robj);
});
......@@ -67,16 +72,26 @@ class DeliverybillCtl extends CtlBase {
}
/*根据交付单编号获取交付单详情和材料详情*/
async DealInfo(pobj,qobj,req){
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined')
{
try{
async dealInfo(pobj, qobj, req) {
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
try {
var rs = await this.service.findInfoByDeliverCode(pobj);
var ms = await this.materialService.findInfoByDeliverNumber(pobj);
var rarr = {}
if (rs){
rarr.id = rs.id;//数据的id
rarr.baseInfo.deliverNumber = rs.deliver_code;//交付单编号
var rarr = {
"baseInfo": {},
"contactsInfo": {},
"statusInfo": {},
"companyInfo": {},
"registeredInfo": {},
"contributionInfo": {},
"positionInfo": {},
"managerInfo": {},
"regInfo": {},
"expressInfo": {}
}
if (rs) {
rarr.id = rs.id;//数据的id
rarr.baseInfo.deliverNumber = rs.delivery_code;//交付单编号
rarr.baseInfo.businessName = rs.product_name;//产品名称
rarr.baseInfo.businessType = rs.product_code;//产品编码
rarr.baseInfo.channelSource = rs.source_name;//渠道名称
......@@ -86,17 +101,65 @@ class DeliverybillCtl extends CtlBase {
rarr.baseInfo.servicerName = rs.facilitator_name;//服务商名称
rarr.baseInfo.clerkName = rs.salesman_name;//业务员名称
rarr.baseInfo.clerkPhone = rs.salesman_phone;//业务员电话
rarr.baseInfo.sellingPrice = rs.selling_price;//价格
rarr.baseInfo.costPrice = rs.cost_price;//成本价
if (rarr.businessName == "云上园区注册"){
rarr.baseInfo.sellingPrice = this.FenToYuan(rs.selling_price);//价格
rarr.baseInfo.costPrice = this.FenToYuan(rs.cost_price);//成本价
rarr.baseInfo.deliverStatus = rs.delivery_status;//状态
rarr.baseInfo.statusReason = rs.close_reason;//状态原因
if (rarr.businessName == "云上园区注册") {
rarr.baseInfo.serviceArea = appconfig.pdict.registeredParkDict[rarr.serviceCode];//服务地区名称
}
else{
else {
rarr.baseInfo.serviceArea = appconfig.pdict.registeredAreaDict[rarr.serviceCode];//服务地区名称
}
rarr.deliveryInfo = rs.delivery_info;//交付单详情
rarr.contactsInfo.contactsName = rs.delivery_info.contactsName;//联系人信息
rarr.contactsInfo.contactsPhone = rs.delivery_info.contactsPhone;//联系电话信息
if (rs.delivery_info.isWhether && rs.delivery_info.isWhether != 'undefined') {
rarr.baseInfo.isWhether = rs.delivery_info.isWhether;//是否刻章
}
//财税服务
if (rs.delivery_info.financial && rs.delivery_info.financial != 'undefined') {
rarr.baseInfo.financial = rs.delivery_info.financial;
}
if (rs.delivery_info.payStatus && rs.delivery_info.payStatus != 'undefined') {
rarr.baseInfo.payStatus = rs.delivery_info.payStatus;//支付状态
}
if (rs.delivery_info.officialSeal && rs.delivery_info.officialSeal != 'undefined') {
rarr.baseInfo.officialSeal = rs.delivery_info.officialSeal;//公章扫描件
}
if (rs.delivery_info.isAdviser && rs.delivery_info.isAdviser != 'undefined') {
rarr.baseInfo.isAdviser = rs.delivery_info.isAdviser;//是否分配顾问
}
if (rs.delivery_info.businessLicense && rs.delivery_info.businessLicense != 'undefined') {
rarr.baseInfo.businessLicense = rs.delivery_info.businessLicense;//营业执照扫描件
}
if (rs.delivery_info.taxpayerType && rs.delivery_info.taxpayerType != 'undefined') {
rarr.baseInfo.taxpayerType = rs.delivery_info.taxpayerType;//纳税人类型
}
if (rs.delivery_info.buyDuration && rs.delivery_info.buyDuration != 'undefined') {
rarr.baseInfo.buyDuration = rs.delivery_info.buyDuration;//购买时长
}
if (rs.delivery_info.buyTime && rs.delivery_info.buyTime != 'undefined') {
rarr.baseInfo.buyTime = rs.delivery_info.buyTime;//购买时间
}
if (rs.delivery_info.buyDuration && rs.delivery_info.buyDuration != 'undefined' && rarr.baseInfo.buyTime && rarr.baseInfo.buyTime != 'undefined') {
var d = new Date(rarr.baseInfo.buyTime);
rarr.baseInfo.endTime = this.oneYearPast(d,Number(rs.delivery_info.buyDuration));//到期时间
var ss = moment();
rarr.baseInfo.surplusDuration =this.diffDays(ss,rarr.baseInfo.endTime);//剩余时长
}
if (rs.delivery_info.isRenew && rs.delivery_info.isRenew != 'undefined') {
rarr.baseInfo.isRenew = rs.delivery_info.isRenew;//是否自动续费
}
if (rs.delivery_info.whetherType && rs.delivery_info.whetherType != 'undefined') {
rarr.baseInfo.whetherType = rs.delivery_info.whetherType;//刻章类型
}
if (rs.delivery_info.subjectType && rs.delivery_info.subjectType != 'undefined') {
rarr.baseInfo.subjectType = rs.delivery_info.subjectType;//代理记账主体类型
}
rarr.baseInfo.createdTime = this.timeFormat(rs.created_at);
rarr.baseInfo.updateTime = this.timeFormat(rs.updated_at)
rarr.statusInfo.deliverStatus = rs.delivery_status;//状态
rarr.statusInfo.statusReason = rs.close_reason;//状态原因
rarr.companyInfo = ms.company_info;//公司详情
......@@ -109,172 +172,381 @@ class DeliverybillCtl extends CtlBase {
}
return system.getResult(rarr);
}
catch(error){
catch (error) {
return system.getResultError(error);
}
}
else{
else {
return system.getResultError("参数错误！");
}
}
/*根据交付单编号更新交付单状态*/
async updateStatusByDeliverCode(pobj,qobj,req){
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.deliverStatus && pobj.deliverStatus != 'undefined'){
try{
var res = await this.service.updateInfoByDeliverCode(pobj);
async updateStatusByDeliverCode(pobj, qobj, req) {
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.deliverStatus && pobj.deliverStatus != 'undefined') {
try {
//调商城接口，回传状态信息，放队列
return system.getResult("更新成功！");
var rc = system.getObject("util.execClient");
var requrl = this.queueUrl;
var params = {
"actionType": "produceData",
"actionBody": {
"pushUrl": this.receiveUrl,
"actionType": "updateOrderStatus",
"identifyCode": "ic-manage",
"messageBody": {
"orderNum": pobj.businessMode,//订单编码
"status": appconfig.pdict.ddyDict[pobj.deliverStatus]
//"deliverContent":pobj
}
}
}
var rtn = await rc.execPost(params, requrl);
var j = JSON.parse(rtn.stdout);
if (j.status == 1) {
await this.service.updateStatusByDeliverCode(pobj);
var pInfo = this.service.findInfoByDeliverCode(pobj);
if (pInfo){
var logInfo = {
"flowType":"DELIVERY",
"flowId":pInfo.id,
"statusCode":pobj.deliverStatus,
"clerkName":pInfo.salesman_name,
"clerkId":pInfo.salesman_id
}
if (pInfo.statusReason && pInfo.statusReason != 'undefined'){
logInfo.statusReason = pInfo.statusReason;
}
await this.logService.insertInfo(logInfo);//插入状态日至表
}
return system.getResult("更新成功！");
}
else {
return system.getResultError("更新状态失败！");
}
}
catch (error){
catch (error) {
return system.getResultError(error);
}
}
else{
else {
return system.getResultError("参数错误!");
}
}
async UpdateofficialSealByDeliverCode(pobj,qobj,req){//更新营业执照扫描件和公章扫描件
if ((pobj.deliverNumber && pobj.deliverNumber != 'undefined' && ((pobj.baseInfo.officialSeal && pobj.baseInfo.officialSeal != 'undefined') || (pobj.baseInfo.businessLicense && pobj.baseInfo.businessLicense != 'undefined')))){
try{
var rs = await this.service.findInfoByDeliverCode(pobj)//先得到交付单详情
if (pobj.baseInfo.officialSeal && pobj.baseInfo.officialSeal != 'undefined'){
rs.delivery_info.officialSeal = pobj.baseInfo.officialSeal;
async UpdateofficialSealByDeliverCode(pobj, qobj, req) {//更新营业执照扫描件和公章扫描件
if ((pobj.deliverNumber && pobj.deliverNumber != 'undefined' && ((pobj.baseInfo.officialSeal && pobj.baseInfo.officialSeal != 'undefined') || (pobj.baseInfo.businessLicense && pobj.baseInfo.businessLicense != 'undefined')))) {
try {
var rs = await this.service.findInfoByDeliverCode(pobj)//先得到交付单详情
if (rs && rs != 'undefined') {
if (pobj.baseInfo.officialSeal && pobj.baseInfo.officialSeal != 'undefined') {
rs.delivery_info.officialSeal = pobj.baseInfo.officialSeal;
}
if (pobj.baseInfo.businessLicense && pobj.baseInfo.businessLicense != 'undefined') {
rs.delivery_info.businessLicense = pobj.baseInfo.businessLicense;
}
//回传信息给庄冰，放队列
var rc = system.getObject("util.execClient");
var requrl = this.queueUrl;
var params = {
"actionType": "produceData",
"actionBody": {
"pushUrl": this.receiveUrl,
"actionType": "updateOrderStatus",
"identifyCode": "ic-manage",
"messageBody": {
"orderNum": pobj.businessMode,//订单编码
"status": appconfig.pdict.ddyDict[rs.delivery_status],
"deliverContent": rs.delivery_info
}
}
}
var rtn = await rc.execPost(params, requrl);
var j = JSON.parse(rtn.stdout);
if (j.status == 1) {
//更新详情
var uarr = {
"deliverNumber": pobj.deliverNumber,
"baseInfo": rs.delivery_info
};
await this.service.updateInfoByDesliverCode(uarr);
return system.getResult("更新成功");
}
else {
return system.getResultError("更新失败！");
}
}
else {
return system.getResultError("数据不存在！");
}
}
if (pobj.baseInfo.businessLicense && pobj.baseInfo.businessLicense != 'undefined'){
rs.delivery_info.businessLicense = pobj.baseInfo.businessLicense;
catch (error) {
return system.getResultError(error);
}
//更新详情
var uarr = {
"deliverNumber":pobj.deliverNumber,
"baseInfo":rs.delivery_info
};
await this.service.updateInfoByDeliverCode(uarr);
//回传信息给庄冰，放队列
return system.getResult("更新成功");
}
catch(error){
return system.getResultError(error);
}
}
else{
else {
return system.getResultError("参数错误！");
}
}
async updateExpressInfoByDeliverCode(pobj,qobj,req){//更新邮寄信息
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.expressInfo && pobj.expressInfo != 'undefined'){
try{
await this.materialService.updateInfoByDeliverNumber(pobj);
//回传庄冰，放队列
return system.getResult("更新成功");
async updateExpressInfoByDeliverCode(pobj, qobj, req) {//更新邮寄信息
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.expressInfo && pobj.expressInfo != 'undefined') {
try {
var deliverInfo = await this.service.findInfoByDeliverCode(pobj)//先得到交付单详情
if (deliverInfo && deliverInfo != 'undefined') {
//回传信息给庄冰，放队列
var rc = system.getObject("util.execClient");
var requrl = this.queueUrl;
var params = {
"actionType": "produceData",
"actionBody": {
"pushUrl": this.receiveUrl,
"actionType": "updateOrderStatus",
"identifyCode": "ic-manage",
"messageBody": {
"orderNum": pobj.businessMode,//订单编码
"status": appconfig.pdict.ddyDict[deliverInfo.delivery_status],
"deliverContent": rs.delivery_info
}
}
}
var j = JSON.parse(rtn.stdout);
if (j.status == 1) {
await this.materialService.updateInfoByDeliverNumber(pobj);
return system.getResult("更新成功");
}
else {
return system.getResultError("更新失败！");
}
}
else {
return system.getResultError("数据不存在！");
}
}
catch{
return system.getResultError(error);
}
}
else{
else {
return system.getResultError("参数错误！");
}
}
/*根据交付单编号更新交付单详情*/
async updateInfoByDeliverCode(pobj,qobj,req){//
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined'){
try{
//更新详情
await this.service.updateInfoByDeliverCode(pobj);
async updateInfoByDeliverCode(pobj, qobj, req) {//
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
try {
var rs = await this.service.findInfoByDeliverCode(pobj)//先得到交付单详情
var baseInfo = rs.delivery_info;
if (pobj.contactsInfo.contactsName && pobj.contactsInfo.contactsName != 'undefined') {
baseInfo.contactsName = pobj.contactsInfo.contactsName;
}
if (pobj.contactsInfo.contactsPhone && pobj.contactsInfo.contactsPhone != 'undefined') {
baseInfo.contactsPhone = pobj.contactsInfo.contactsPhone;
}
var parms = {
"deliverNumber": pobj.deliverNumber
}
if (rs.product_code == "psCase") {
parms.deliverStatus = "checking";//状态为园区入驻审核
baseInfo.payStatus = "已交付";
}
else if (rs.product_code == "companyCase") {
parms.deliverStatus = "auditing";//状态为工商审核环节
baseInfo.payStatus = "已交付";
}
parms.baseInfo = baseInfo;
await this.service.updateInfoByDeliverCode(parms);
//更新材料信息
await this.materialService.updateInfoByDeliverNumber(pobj);
var statusInfo = {
"deliverNumber":pobj.deliverNumber,
"deliverStatus":"collecting"//状态为收集工商注册材料
};
//更新状态
await this.service.updateStatusByDeliverCode(statusInfo);
return system.getResult("操作成功！");
//return system.getResult("操作成功！");
//传给庄冰，放队列
// pobj.baseInfo = deliveryInfo;
// var rc = system.getObject("util.execClient");
// var requrl = this.receiveUrl;
// var params = {
// "actionType":"updateOrderStatus",
// "actionBody":{
// "orderNum": pobj.deliverNumber,//订单编码
// "status":appconfig.pdict.ddyDict["collecting"],
// "deliverContent":pobj
// }
// }
// var rtn = await rc.execPost(params, requrl);
// var j = JSON.parse(rtn.stdout);
// if (j.status == 1){
// return system.getResult("操作成功！");
// }
// else{
// return system.getResultError("更新交付单状态出错！");
// }
baseInfo.clerkName = rs.salesman_name;//业务员名称
baseInfo.clerkPhone = rs.salesman_phone;
pobj.baseInfo = baseInfo;
var rc = system.getObject("util.execClient");
var requrl = this.receiveUrl;
var params = {
"actionType": "updateOrderStatus",
"actionBody": {
"orderNum": pobj.deliverNumber,//订单编码
//"status":appconfig.pdict.ddyDict["collecting"],
"deliverContent": pobj
}
}
if (rs.product_code == "psCase") {
params.actionBody.status = appconfig.pdict.ddyDict["checking"];
}
else if (rs.product_code == "companyCase") {
params.actionBody.status = appconfig.pdict.ddyDict["auditing"];
}
else {
params.actionBody.status = appconfig.pdict.ddyDict[rs.delivery_status];
}
var rtn = await rc.execPost(params, requrl);
var j = JSON.parse(rtn.stdout);
if (j.status == 1) {
return system.getResult("操作成功！");
}
else {
return system.getResultError("更新交付单状态出错！");
}
}
catch(error){
catch (error) {
return system.getResultError(error);
}
}
else{
else {
return system.getResultError("参数错误！");
}
}
async settleApply(p,q,req){
let ids=p.ids
let rtn=await this.service.settleApply(ids,req.userid,req.username)
return system.getResult({})
async settleApply(p, q, req) {
let ids = p.ids
let rtn = await this.service.settleApply(ids, req.userid, req.username)
return system.getResult({})
}
/*根据商机编号插入交付单信息*/
async insertInfo(pobj,qobj,req){//队列的时候用
if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.schemeNumber && pobj.schemeNumber != 'undefined'
&& pobj.deliverNumber && pobj.deliverNumber != 'undefined'){
try{
async insertInfo(pobj, qobj, req) {//队列的时候用
if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.schemeNumber && pobj.schemeNumber != 'undefined'
&& pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
try {
pobj.deliverStatus = "received";
if (pobj.businessMode && pobj.businessMode != 'undefined') {//如果有商机编号，需要取方案编号
var schemeInfo = await this.schemeService.findInfoByDemandCode(pobj);
if (schemeInfo && schemeInfo != 'undefined') {
pobj.schemeNumber = schemeInfo.scheme_number;
}
}
//更新状态给庄冰
var rc = system.getObject("util.execClient");
var requrl = this.receiveUrl;
var params = {
"actionType":"updateOrderStatus",
"actionBody":{
"orderNum": pobj.businessMode,//订单编码
"status":20,//已接单
"deliverContent":pobj
}
}
var requrl = this.queueUrl;
var params = {
"actionType": "produceData",
"actionBody": {
"pushUrl": this.receiveUrl,
"actionType": "updateOrderStatus",
"identifyCode": "ic-manage",
"messageBody": {
"orderNum": pobj.businessMode,//订单编码
"status": 20,//已接单
"deliverContent": pobj
}
}
}
var rtn = await rc.execPost(params, requrl);
var j = JSON.parse(rtn.stdout);
if (j.status == 1){
if (j.status == 1) {
var res = await this.service.insertInfo(pobj);
var mobj = {
"deliverId": res.id,
"deliverNumber": pobj.deliverNumber
}
var logInfo = {
"flowType":"DELIVERY",
"flowId":res.id,
"statusCode":res.delivery_status,
"statusReason":res.close_reason,
"clerkName":res.salesman_name,
"clerkId":res.salesman_id
}
await this.logService.insertInfo(logInfo);//插入状态日至表
if (pobj.companyInfo && pobj.companyInfo != 'undefined') {
mobj.companyInfo = pobj.companyInfo;
}
await this.materialService.insertInfo(mobj);
return system.getResult("插入成功！");
}
else{
else {
return system.getResultError("插入数据失败！");
}
}
catch (error){
catch (error) {
return system.getResultError(error);
}
}else{
} else {
return system.getResultError("参数错误!");
}
}
timeFormat(date) {
let localTime = moment.utc(date).toDate();
localTime = moment(localTime).format("YYYY-MM-DD");
return localTime;
}
//元转分 - 解决精度问题 yuan:要转换的钱，单位元； digit：转换倍数
YuanToFen(yuan, digit) {
var m = 0,
s1 = yuan.toString(),
s2 = digit.toString();
try { m += s1.split(".")[1].length } catch (e) { }
try { m += s2.split(".")[1].length } catch (e) { }
return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m)
}
FenToYuan(fen) {
var num = fen;
num = fen * 0.01;
num += '';
var reg = num.indexOf('.') > -1 ? /(\d{1,3})(?=(?:\d{3})+\.)/g : /(\d{1,3})(?=(?:\d{3})+$)/g;
num = num.replace(reg, '$1');
num = this.toDecimal2(num);
return num;
}
toDecimal2(x) {
var f = parseFloat(x);
if (isNaN(f)) {
return false;
}
var f = Math.round(x * 100) / 100;
var s = f.toString();
var rs = s.indexOf('.');
if (rs < 0) {
rs = s.length;
s += '.';
}
while (s.length <= rs + 2) {
s += '0';
}
return s;
}
//time时间n年后的的前一天
oneYearPast(time,n) {
//var time=new Date();
var year = time.getFullYear() + n;
var d = time.setFullYear(year);
var date = time.getDate(d) -1;
var xx = time.setDate(date);
return moment( new Date(xx)).format('yyyy-MM-DD');
}
//计算俩日期相差多少天
diffDays(time1,time2){
var m1 = moment(time1);
var m2 = moment(time2);
return m2.diff(m1,'day');
}
}
module.exports = DeliverybillCtl;
// var task = new DeliverybillCtl();
// var d = new Date("2020-06-05");
// var oneYear = task.oneYearPast(d);
// var ss = moment();
// var diff = task.diffDays(ss,oneYear);
// console.log(oneYear);
// console.log(diff);
// var obj={"deliverNumber":"1111115","baseInfo":"","deliverInfo":{"isVirtual": "否", "isWhether": "是", "payStatus": "已交付", "contactsName": "张三", "contactsPhone": "13800138000"},"companyInfo":{"isWhether": "no", "addressType": "practical", "fullAddress": "gsgsgsgsgsg", "taxpayerType": "smallScaleTaxpayer", "businessScope": "sgsgsdgsdgd", "engagedIndustry": "culturalMedia", "companyProperties": "limitedLiabilityCompany"},
// "registeredInfo":{"registeredCapital":"500","registeredDate":"20","reserveProportion":"15"},"contributionInfo":{"contribution_info":[{"shareholderName":"王五","contributionAmount":"200","contributionProportion":"40","IdentificationNumber":"1111111","phoneNumber":"1111111","contactAddress":"北京"},
// {"shareholderName":"王六","contributionAmount":"200","contributionProportion":"40","IdentificationNumber":"1111111","phoneNumber":"1111111","contactAddress":"北京"},
......
ic-deliver/app/base/controller/impl/bizchance/schemeCtl.js
......@@ -9,7 +9,9 @@ class SchemeCtl extends CtlBase {
constructor() {
super("bizchance", CtlBase.getServiceName(SchemeCtl));
this.bizoptService = system.getObject("service.bizchance.bizoptSve");
this.receiveUrl = "http://192.168.1.140:4011/api/receive/entService/springBoard";
this.logService = system.getObject("service.bizchance.statuslogSve");
this.receiveUrl = "http://192.168.1.128:4011/api/receive/entService/springBoard";
// this.queueUrl = "http://192.168.1.128:4018/api/queueAction/producer/springBoard";
}
/*根据id获取方案信息详情*/
......@@ -139,6 +141,26 @@ class SchemeCtl extends CtlBase {
if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.currentStatus && pobj.currentStatus != 'undefined'){
try{
await this.service.updateStatusByDemandCode(pobj);
var res= thsi.service.findInfoByDemandCode(pobj);
if (res){
var logInfo = {
"flowType":"SCHEME",
"flowId":res.id,
"statusCode":res.scheme_status,
"statusReason":res.reject_reason,
"clerkName":res.salesman_name,
"clerkId":res.salesman_id
}
await this.logService.insertInfo(logInfo);//插入状态日至表
}
if (pobj.currentStatus == "已退回"){
var parms ={
"businessMode": pobj.businessMode,
"currentStatus": "beforeSubmission"
}
await this.bizoptService.updateStatusByDemandCode(parms);//把商机状态修改为待提交方案
}
return system.getResult("更新成功！");
}
catch(error){
......@@ -182,12 +204,13 @@ class SchemeCtl extends CtlBase {
if (pobj.baseInfo.psSealSevCase && pobj.baseInfo.psSealSevCase != 'undefined'){
pobj.baseInfo.isWhether = pobj.baseInfo.psSealSevCase
}
//纳税人类型
if (pobj.baseInfo.psTaxpayerType && pobj.baseInfo.psTaxpayerType != 'undefined'){
pobj.baseInfo.taxpayerType = pobj.baseInfo.taxpayerType;
pobj.baseInfo.taxpayerType = pobj.baseInfo.psTaxpayerType;
}
if (pobj.baseInfo.cmpTaxPayerType && pobj.baseInfo.cmpTaxPayerType != 'undefined'){
pobj.baseInfo.taxpayerType = pobj.baseInfo.taxpayerType;
pobj.baseInfo.taxpayerType = pobj.baseInfo.cmpTaxPayerType;
}
if (pobj.baseInfo.agentTaxpayerType && pobj.baseInfo.agentTaxpayerType != 'undefined'){
pobj.baseInfo.taxpayerType = pobj.baseInfo.agentTaxpayerType;
......@@ -271,7 +294,7 @@ class SchemeCtl extends CtlBase {
var rc = system.getObject("util.execClient");
var requrl = this.receiveUrl;
var params = {
"actionType":"submitSolution",
"actionType":"actionType",
"actionBody":{
"needNum": pobj.businessMode,
"solutionNum":pobj.schemeNumber,
......@@ -280,11 +303,10 @@ class SchemeCtl extends CtlBase {
}
var rtn = await rc.execPost(params, requrl);
var j = JSON.parse(rtn.stdout);
console.log("777777777777777777");
console.log(JSON.stringify(j));
if (j.status == 1){
pobj.businessType = ttype;
var retn = await this.service.updateInfoByDemandCode(pobj);//更新方案详情
pobj.schemeNumber = j.data;
await this.service.updateInfoByDemandCode(pobj);//更新方案详情,同时更新新的方案编号
var bobj = {"businessMode":pobj.businessMode,"currentStatus":"beforeConfirmation"};//同时把商机状态更新回待确认
await this.bizoptService.updateStatusByDemandCode(bobj);
return system.getResult("更新成功！");
......@@ -294,13 +316,10 @@ class SchemeCtl extends CtlBase {
}
}
catch(error){
console.log("ffffffffffffffffffffffffffffffff");
console.log(error);
return system.getResultError(error);
}
}
else{
console.log("DDDDDDDDDDDDDDD");
return system.getResultError("参数错误！");
}
}
......@@ -323,8 +342,6 @@ class SchemeCtl extends CtlBase {
/*插入方案信息*/
async insertInfo(pobj, qobj, req){
console.log("11111111111111111111111");
console.log(JSON.stringify(pobj));
if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.baseInfo && pobj.baseInfo != 'undefined'){//商机编号必须存在
try{
pobj.currentStatus = "beforeConfirmation";//商机状态为待用户确认
......@@ -357,10 +374,10 @@ class SchemeCtl extends CtlBase {
}
//纳税人类型
if (pobj.baseInfo.psTaxpayerType && pobj.baseInfo.psTaxpayerType != 'undefined'){
pobj.baseInfo.taxpayerType = pobj.baseInfo.taxpayerType;
pobj.baseInfo.taxpayerType = pobj.baseInfo.psTaxpayerType;
}
if (pobj.baseInfo.cmpTaxPayerType && pobj.baseInfo.cmpTaxPayerType != 'undefined'){
pobj.baseInfo.taxpayerType = pobj.baseInfo.taxpayerType;
pobj.baseInfo.taxpayerType = pobj.baseInfo.cmpTaxPayerType;
}
if (pobj.baseInfo.agentTaxpayerType && pobj.baseInfo.agentTaxpayerType != 'undefined'){
pobj.baseInfo.taxpayerType = pobj.baseInfo.agentTaxpayerType;
......@@ -454,8 +471,6 @@ class SchemeCtl extends CtlBase {
}
var rtn = await rc.execPost(params, requrl);
var j = JSON.parse(rtn.stdout);
console.log("!!!!!!!!!!!!!!!!");
console.log(JSON.stringify(j));
if (j.status == 1){
pobj.schemeNumber = j.data;
pobj.businessType = btype;
......@@ -469,8 +484,6 @@ class SchemeCtl extends CtlBase {
}
catch(error){
console.log("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
console.log(error);
return system.getResultError(error);
}
}
......
ic-deliver/app/base/db/impl/bizchance/bizoptDao.js
......@@ -54,7 +54,7 @@ class BizoptDao extends Dao {
var obj = {
"demand_code": qobj.businessMode,
"business_type": qobj.businessType,
"business_status": "beforeSubmission"
"business_status": qobj.currentStatus
};
if (qobj.channelSource && qobj.channelSource != 'undefined') {
obj.source_name = qobj.channelSource;
......@@ -77,6 +77,9 @@ class BizoptDao extends Dao {
if (qobj.contactsPhone && qobj.contactsPhone != 'undefined') {
obj.business_info.contactsPhone = qobj.contactsPhone;
}
if (qobj.serviceName && qobj.serviceName != 'undefined'){
obj.business_info.serviceName = qobj.serviceName;
}
if (qobj.servicerCode && qobj.servicerCode != 'undefined') {
obj.facilitator_id = qobj.servicerCode;
}
......
ic-deliver/app/base/db/impl/bizchance/deliverybillDao.js
......@@ -51,32 +51,52 @@ class DeliverybillDao extends Dao {
setobj.close_reason = qobj.statusReason;
}
var whereobj = { "delivery_code": qobj.deliverNumber };
var rs = await this.findOne(whereobj);
if (rs && rs != 'undefined'){
if (qobj.deliverStatus == "collecting" || qobj.deliverStatus == "received" || qobj.deliverStatus == "paid"){
rs.delivery_info.payStatus = "待交付";
}
else if (qobj.deliverStatus == "closed"){
rs.delivery_info.payStatus = "已关闭";
}
else{
rs.delivery_info.payStatus = "已交付";
}
setobj.delivery_info = rs.delivery_info;
}
return await this.updateByWhere(setobj, whereobj, t);
}
/*根据交付单更新交付材料信息*/
async UpdateInfoByDeliverCode(qobj, t) {//公司注册、云上园区注册时填写交付材料
async updateInfoByDeliverCode(qobj, t) {//公司注册、云上园区注册时填写交付材料
var whereobj = { "delivery_code": qobj.deliverNumber };
var setobj = { "delivery_info": qobj.baseInfo };
if (qobj.deliverStatus && qobj.deliverStatus != 'undefined'){
setobj.delivery_status = qobj.deliverStatus;
}
if (qobj.statusReason && qobj.statusReason != 'undefined') {
setobj.close_reason = qobj.statusReason;
}
return await this.updateByWhere(setobj, whereobj, t);
}
/*插入交付单信息*/
async insertInfo(qobj, t) {//到时候看交付单信息后再确定
var obj = {
"demand_code": qobj.businessMode,
"scheme_number": qobj.schemeNumber,
"delivery_code": qobj.deliverNumber,
"delivery_status": "received"
"delivery_status": qobj.deliverStatus
};
if (qobj.businessMode && qobj.businessMode != 'undefined'){
obj.demand_code = qobj.businessMode;
}
if (qobj.schemeNumber && qobj.schemeNumber != 'undefined'){
obj.scheme_number = qobj.schemeNumber;
}
if (qobj.businessName && qobj.businessName != 'undefined') {
obj.product_name = qobj.businessName;
}
if (qobj.businessType && qobj.businessType != 'undefined') {
obj.product_code = qobj.businessType;
//if (qobj.businessType == "companyCase" || qobj.businessType == "psCase"){
obj.delivery_info.payStatus = "待交付";
//}
}
if (qobj.channelSource && qobj.channelSource != 'undefined') {
obj.source_name = qobj.channelSource;
......@@ -108,54 +128,15 @@ class DeliverybillDao extends Dao {
if (qobj.clerkId && qobj.clerkId != 'undefined') {
obj.salesman_id = qobj.clerkId;
}
if (qobj.payAmount && qobj.payAmount != 'undefined') {
obj.selling_price = qobj.payAmount;
if (qobj.sellingPrice && qobj.sellingPrice != 'undefined') {
obj.selling_price = qobj.sellingPrice;
}
// if (qobj.deliverStatus && qobj.deliverStatus != 'undefined'){
// obj.delivery_status = qobj.deliverStatus;
// }
if (qobj.costPrice && qobj.costPrice != 'undefined') {
obj.cost_price = qobj.costPrice;
}
if (qobj.statusReason && qobj.statusReason != 'undefined') {
obj.close_reason = qobj.statusReason;
}
// if (qobj.isWhether && qobj.isWhether != 'undefined'){
// obj.delivery_info.isWhether = qobj.isWhether;
// }
// if (qobj.isVirtual && qobj.isVirtual != 'undefined'){
// obj.delivery_info.isVirtual = qobj.isVirtual;
// }
// if (qobj.officialSeal && qobj.officialSeal != 'undefined'){
// obj.delivery_info.officialSeal = qobj.officialSeal;
// }
// if (qobj.businessLicense && qobj.businessLicense != 'undefined'){
// obj.delivery_info.businessLicense = obj.businessLicense;
// }
// if (qobj.taxpayerType && qobj.taxpayerType != 'undefined'){
// obj.delivery_info.taxpayerType = qobj.taxpayerType;
// }
// if (qobj.whetherType && qobj.whetherType != 'undefined'){
// obj.delivery_info.whetherType = qobj.whetherType;
// }
// if (qobj.subjectType && qobj.subjectType != 'undefined'){
// obj.delivery_info.subjectType = qobj.subjectType;
// }
// if (qobj.buyTime && qobj.buyTime != 'undefined'){
// obj.delivery_info.buyTime = qobj.buyTime;
// }
// if (qobj.buyDuration && qobj.buyDuration != 'undefined'){
// obj.delivery_info.buyDuration = qobj.buyDuration;
// }
// if (qobj.isRenew && qobj.isRenew != 'undefined'){
// obj.delivery_info.isRenew = qobj.isRenew;
// }
if (qobj.contactsName && qobj.contactsName != 'undefined') {
obj.delivery_info.contactsName = qobj.contactsName;
}
if (qobj.contactsPhone && qobj.contactsPhone != 'undefined') {
obj.delivery_info.contactsPhone = qobj.contactsPhone;
}
return await this.create(obj, t);
}
......
ic-deliver/app/base/db/impl/bizchance/schemeDao.js
......@@ -25,6 +25,9 @@ class SchemeDao extends Dao {
async updateInfoByDemandCode(qobj,t){
var whereobj = {"demand_code":qobj.businessMode};
var setobj = {"scheme_info":qobj.baseInfo,"scheme_status":qobj.currentStatus};
if (qobj.schemeNumber && qobj.schemeNumber != 'undefined'){
setobj.scheme_number = qobj.schemeNumber;
}
return await this.updateByWhere(setobj,whereobj,t);
}
......
ic-deliver/app/base/db/impl/bizchance/statuslogDao.js
......@@ -10,10 +10,16 @@ class StatuslogDao extends Dao {
var obj = {
"flow_type":qobj.flowType,
"flow_id":qobj.flowId,
"status_code":qobj.statusCode,
"status_code":qobj.statusCode
};
if (qobj.statusDate && qobj.statusDate != 'undefined'){
obj["status_date"] = qobj.statusDate
if (qobj.statusReason && qobj.statusReason != 'undefined'){
obj.status_reason = qobj.statusReason;
}
if (qobj.clerkName && qobj.clerkName != 'undefined'){
obj.salesman_name = qobj.clerkName;
}
if (qobj.clerkId && qobj.clerkId != 'undefined'){
obj.salesman_id = qobj.clerkId;
}
return await this.create(obj,t);
}
......
ic-deliver/app/base/db/metadata/app/platform.js
module.exports = {
"config": {
"pdict": {
"app_type": { "api": "API服务","web": "PCWEB","app":"移动APP","xcx":"小程序","access":"接入"},
"app_type": { "api": "API服务", "web": "PCWEB", "app": "移动APP", "xcx": "小程序", "access": "接入" },
"data_priv": { "auth.role": "角色", "auth.user": "用户" },
"noticeType": {"sms": "短信", "email": "邮件","wechat":"微信"},
"authType": {"add": "新增", "edit": "编辑","delete":"删除","export":"导出","show":"查看"},
"mediaType": {"vd": "视频", "ad": "音频","qt":"其它"},
"usageType": {"kt": "课堂","taxkt":"财税课堂", "qt": "其它"},
"opstatus": {"0": "失败", "1": "成功"},
"sex": {"male": "男", "female": "女"},
"logLevel": {"debug": 0, "info": 1, "warn": 2, "error": 3, "fatal": 4},
"msgType": { "sys": "系统", "single": "单点", "multi": "群发"},
"node_type":{"org":"组织","arc":"文档"},
"noticeType": { "sms": "短信", "email": "邮件", "wechat": "微信" },
"authType": { "add": "新增", "edit": "编辑", "delete": "删除", "export": "导出", "show": "查看" },
"mediaType": { "vd": "视频", "ad": "音频", "qt": "其它" },
"usageType": { "kt": "课堂", "taxkt": "财税课堂", "qt": "其它" },
"opstatus": { "0": "失败", "1": "成功" },
"sex": { "male": "男", "female": "女" },
"logLevel": { "debug": 0, "info": 1, "warn": 2, "error": 3, "fatal": 4 },
"msgType": { "sys": "系统", "single": "单点", "multi": "群发" },
"node_type": { "org": "组织", "arc": "文档" },
"source": {//渠道来源
"tencentCloud": "腾讯云"
},
},
"businessType": {//商机类型
"companyCase": "公司注册",
"psCase":"云上园区注册",
"psCase": "云上园区注册",
// "psCase": "个体户注册",
// "soleCase": "个人独资企业注册",
"agentCase": "代理记账",
......@@ -37,55 +37,55 @@ module.exports = {
"isClosed": "已关闭"
},
"deliverStatus": {//交付单状态
"received":"已接单",//接单日期，公司注册云上园区
"collecting":"收集工商注册材料",//请配合顾问尽快提供，公司注册
"uploading":"上传注册材料",//请配合顾问尽快提供,云上园区注册
"checking":"园区入驻审核",//1个工作日完成，云上园区注册
"auditing":"工商审核环节",//10个工作日内，公司注册、云上园区
"engraving":"刻章环节",//5个工作日内，只有选择了刻章服务时才有该状态
"posting":"证件邮寄环节",//3个工作日内，公司注册、云上园区
"paid":"已付款",//增值服务
"inservice":"已交付",//增值服务
"success":"已完成",//税务报道、税控申请、银行开户、工商年报、工商变更、社保开户、刻章服务
"signed":"已签收",//公司注册、云上园区
"expired":"已到期",//代理记账、注册地址
"closed":"关闭交付"//只有在已接单和收集工商注册材料阶段才能关闭交付
"received": "已接单",//接单日期，公司注册云上园区
"collecting": "材料收集环节",//请配合顾问尽快提供，公司注册
"uploading": "上传注册材料",//请配合顾问尽快提供,云上园区注册
"checking": "园区入驻审核",//1个工作日完成，云上园区注册
"auditing": "工商审核环节",//10个工作日内，公司注册、云上园区
"engraving": "刻章环节",//5个工作日内，只有选择了刻章服务时才有该状态
"posting": "证件邮寄环节",//3个工作日内，公司注册、云上园区
"paid": "已付款",//增值服务
"inservice": "已交付",//增值服务
"success": "已完成",//税务报道、税控申请、银行开户、工商年报、工商变更、社保开户、刻章服务
"signed": "已签收",//公司注册、云上园区
"expired": "已到期",//代理记账、注册地址
"closed": "关闭交付"//只有在已接单和收集工商注册材料阶段才能关闭交付
},
"diliverStatus1": {//公司注册交付单状态
"received":"已接单",//接单日期
"collecting":"收集工商注册材料",//请配合顾问尽快提供
"auditing":"工商审核环节",//10个工作日内
"engraving":"刻章环节",//5个工作日内，只有选择了刻章服务时才有该状态
"posting":"证件邮寄环节",//3个工作日内
"signed":"已签收",
"closed":"关闭交付"//只有在已接单和收集工商注册材料阶段才能关闭交付
"received": "已接单",//接单日期
"collecting": "材料收集环节",//请配合顾问尽快提供
"auditing": "工商审核环节",//10个工作日内
"engraving": "刻章环节",//5个工作日内，只有选择了刻章服务时才有该状态
"posting": "证件邮寄环节",//3个工作日内
"signed": "已签收",
"closed": "关闭交付"//只有在已接单和收集工商注册材料阶段才能关闭交付
},
"diliverSataus2": {//云上园区注册交付状态
"received":"已接单",//接单日期
"uploading":"上传注册材料",//请配合顾问尽快提供
"checking":"园区入驻审核",//1个工作日完成
"auditing":"工商审核环节",//10个工作日内
"engraving":"刻章环节",//5个工作日内，只有选择了刻章服务时才有该状态
"posting":"证件邮寄环节",//3个工作日内
"signed":"已签收",
"closed":"关闭交付"//只有在已接单和收集工商注册材料阶段才能关闭交付
},
"diliverSataus3":{// 税务报道、税控申请、银行开户、工商年报、工商变更、社保开户、刻章服务交付状态
"paid":"已付款",
"received":"已接单",
"inservice":"已交付",
"completed":"已完成"
},
"payStatus":{//交付状态
"已交付":"已交付",
"待交付":"待交付",
"已关闭":"已关闭"
"received": "已接单",//接单日期
"collecting": "材料收集环节",//请配合顾问尽快提供
"checking": "园区入驻审核",//1个工作日完成
"auditing": "工商审核环节",//10个工作日内
"engraving": "刻章环节",//5个工作日内，只有选择了刻章服务时才有该状态
"posting": "证件邮寄环节",//3个工作日内
"signed": "已签收",
"closed": "关闭交付"//只有在已接单和收集工商注册材料阶段才能关闭交付
},
"diliverSataus3": {// 税务报道、税控申请、银行开户、工商年报、工商变更、社保开户、刻章服务交付状态
"paid": "已付款",
"received": "已接单",
"inservice": "已交付",
"success": "已完成"
},
"payStatus": {//交付状态
"已交付": "已交付",
"待交付": "待交付",
"已关闭": "已关闭"
},
"diliverSataus4": {//代理记账、注册地址交付状态
"paid":"已付款",
"received":"已接单",
"inservice":"已交付",
"expired":"已到期"
"paid": "已付款",
"received": "已接单",
"inservice": "已交付",
"expired": "已到期"
},
"registeredAreaDict": {//注册地区
"beijing": "北京市",
......@@ -102,11 +102,11 @@ module.exports = {
"shijiazhuang": "石家庄市",
"jinhua": "金华市",
"changzhou": "常州市",
"nantong":"南通市",
"nantong": "南通市",
"xuzhou": "徐州市",
"jiaxing": "嘉兴市",
"taizhou":"台州市",
"shaoxing":"绍兴市",
"taizhou": "台州市",
"shaoxing": "绍兴市",
"taiyuan": "太原市",
"yantai": "烟台市",
"yangzhou": "扬州市"
......@@ -145,19 +145,24 @@ module.exports = {
},
"registeredTypeDict": {//个体户类型
"selfEmployed": "个体工商户",
"soleProprietorship": "个人独资企业"
"soleProprietorship": "个人独资企业",
"company": "有限公司"
},
"registeredParkDict":{//注册园区
"shanghai":"上海云上公司",
"beijing":"北京云上公司"
"registeredParkDict": {//注册园区
"shanghai": "上海云上公司",
"beijing": "北京云上公司"
},
"sealSevTypeDict": {//刻章类型
"company": "公司章",
"individual": "个体工商户章"
"company": "公司章",
"individual": "个体工商户章"
},
"agentTypeDict": {//代理记账主体类型
"company": "公司",
"individual": "个体户"
"individual": "个体户"
},
"financialDict": {//财税服务
"yes": "需要",
"no": "不需要"
},
"buyDurationDict": {//购买时长
"buyDuration": "1年",
......@@ -165,48 +170,48 @@ module.exports = {
"isRenewDict": {//是否自动续费
"isRenew": "开启",
},
"dyDict":{//产品对应关系
"/ic/gsreg/":"companyCase",
"/ic/kzfw/":"sealSevCase",
"/ic/cpreg/":"psCase",
"/ic/bankopen/":"openBankAccountCase",
"/ic/swbd/":"taxCase",
"/ic/sksq/":"taxControlCase",
"/ic/dljz/":"agentCase",
"/ic/regaddr/":"regAddrCase",
"/ic/gsnb/":"icCheckCase",
"/ic/gschangs/":"icChangeCase",
"/ic/sbopen/":"ssOpenCase"
},
"fdyDict":{//产品反对应关系
"companyCase":"/ic/gsreg/",
"sealSevCase":"/ic/kzfw/",
"psCase":"/ic/cpreg/",
"openBankAccountCase":"/ic/bankopen/",
"taxCase":"/ic/swbd/",
"taxControlCase":"/ic/sksq/",
"agentCase":"/ic/dljz/",
"regAddrCase":"/ic/regaddr/",
"icCheckCase":"/ic/gsnb/",
"icChangeCase":"/ic/gschangs/",
"ssOpenCase":"/ic/sbopen/"
},
"ddyDict":{//和庄冰的交付单对应关系
"paid":1,
"received":20,
"inservice":30,
"collecting":100,
"uploading":110,
"checking":120,
"auditing":130,
"engraving":140,
"posting":150,
"signed":160,
"completed":170,
"expired":180,
"closed":190
},
"flowType":{
"dyDict": {//产品对应关系
"/ic/gsreg/": "companyCase",
"/ic/kzfw/": "sealSevCase",
"/ic/cpreg/": "psCase",
"/ic/bankopen/": "openBankAccountCase",
"/ic/swbd/": "taxCase",
"/ic/sksq/": "taxControlCase",
"/ic/dljz/": "agentCase",
"/ic/regaddr/": "regAddrCase",
"/ic/gsnb/": "icCheckCase",
"/ic/gschangs/": "icChangeCase",
"/ic/sbopen/": "ssOpenCase"
},
"fdyDict": {//产品反对应关系
"companyCase": "/ic/gsreg/",
"sealSevCase": "/ic/kzfw/",
"psCase": "/ic/cpreg/",
"openBankAccountCase": "/ic/bankopen/",
"taxCase": "/ic/swbd/",
"taxControlCase": "/ic/sksq/",
"agentCase": "/ic/dljz/",
"regAddrCase": "/ic/regaddr/",
"icCheckCase": "/ic/gsnb/",
"icChangeCase": "/ic/gschangs/",
"ssOpenCase": "/ic/sbopen/"
},
"ddyDict": {//和庄冰的交付单对应关系
"paid": 1,
"received": 20,
"inservice": 30,
"collecting": 100,
"uploading": 110,
"checking": 120,
"auditing": 130,
"engraving": 140,
"posting": 150,
"signed": 160,
"completed": 170,
"expired": 180,
"closed": 190
},
"flowType": {
"BIZ": "BIZ",//商机表
"SCHEME": "SCHEME",//方案表
"DELIVERY": "DELIVERY"//服务单表
......
ic-deliver/app/base/db/models/delivery/status_log.js
......@@ -14,14 +14,22 @@ module.exports = (db, DataTypes) => {
allowNull: false,
type: DataTypes.STRING
},
status_date: { // 状态日期
status_reason: { // 状态原因
allowNull: true,
type: DataTypes.DATE
type: DataTypes.STRING
},
status_code: { // 流转状态
allowNull: false,
type: DataTypes.STRING
}
},
salesman_id: {// 业务员id
allowNull: true,
type: DataTypes.STRING
},
salesman_name: { // 业务员姓名
allowNull: true,
type: DataTypes.STRING
}
}, {
paranoid: false,//假的删除
underscored: true,
......
ic-deliver/app/base/service/impl/bizchance/SchemeSve.js
......@@ -14,6 +14,7 @@ class SchemeService extends ServiceBase {
async findInfoByDemandCode(qobj){//根据方案编号获取方案详情
return await this.dao.findInfoByDemandCode(qobj);
}
async updateStatusByDemandCode(qobj){//根据商机编号号更新方案状态及原因
......
ic-deliver/app/base/service/impl/bizchance/deliverybillSve.js
......@@ -28,29 +28,26 @@ class DeliverybillService extends ServiceBase {
return apps;
}
/*根据交付单编号获取交付单详情*/
async findInfoByDeliverCode(qobj){
async findInfoByDeliverCode(qobj){//*根据交付单编号获取交付单详情*/
return await this.dao.findInfoByDeliverCode(qobj);
}
/* 根据交付单编号更新交付单状态 */
async updateStatusByDeliverCode(qobj){
async updateStatusByDeliverCode(qobj){//* 根据交付单编号更新交付单状态 */
var self=this;
return self.db.transaction(async function (t) {
return await self.dao.updateStatusByDeliverCode(qobj,t);
});
}
/*更新交付单信息 */
async UpdateInfoByDeliverCode(qobj){
async updateInfoByDeliverCode(qobj){//*更新交付单信息 */
console.log("--------------------------------------------------------------------------------------------------------------------------------------");
var self=this;
return self.db.transaction(async function (t) {
return await self.dao.UpdateInfoByDeliverCode(qobj,t);
return await self.dao.updateInfoByDeliverCode(qobj,t);
});
}
/*插入交付单信息*/
async insertInfo(qobj){//从队列取数据的时候用
async insertInfo(qobj){//*插入交付单信息*/从队列取数据的时候用
var self=this;
return self.db.transaction(async function (t) {
return await self.dao.insertInfo(qobj,t);
......
ic-deliver/app/base/system.js
......@@ -217,7 +217,8 @@ class System {
try {
ClassObj = require(objabspath);
} catch (e) {
// console.log(e)
console.log("ooooooooooooooooooooooooooo");
console.log(e)
let fname = objsettings[packageName + "base"];
ClassObj = require(fname);
}
......
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