Skip to content

Z
zhichan
Commit 4575dae7 by 兰国旗
Options

todo

parent 270ec574
Showing with 76 additions and 180 deletions
center-order/app/base/service/impl/qcutils/regCenterOrderSve.js
......@@ -1105,29 +1105,6 @@ class RegCenterOrderService {
return system.getResultFail(-401, "方案需求信息有误");
}
//获取交付信息 原始公司注册 start
// let orderdeliverySqlData = {
// sourceOrderNo: ab.orderNo
// }
// let orderdeliverySql = "SELECT * FROM `c_order_delivery` WHERE sourceOrderNo = :sourceOrderNo ORDER BY id DESC limit 1";
// let orderdeliveryInfo = await this.orderdeliveryDao.customQuery(orderdeliverySql, orderdeliverySqlData)
// var solutionFlowList = [];
// var deliveryContent;
// if (orderdeliveryInfo[0] && orderdeliveryInfo[0].deliveryContent) {
// deliveryContent = orderdeliveryInfo[0].deliveryContent;
// if (deliveryContent && deliveryContent.status && deliveryContent.ApplicationStatus && deliveryContent.solutionFlowList) {
// // if (this.regStatus[deliveryContent.status] && this.regStatus[deliveryContent.status] > ab.ApplicationStatus) {
// // return system.getResultFail(-403, "操作失败，交付流程未按顺序执行");
// // }
// if (this.regStatus[deliveryContent.ApplicationStatus] && this.regStatus[deliveryContent.ApplicationStatus] == ab.ApplicationStatus && ab.ApplicationStatus == 705) {
// return system.getResultFail(-405, "操作失败，该方案已完成，不能更改");
// }
// solutionFlowList = deliveryContent.solutionFlowList || [];
// }
// } else {
// var deliveryContent = needsolutioninfo.solutionContent;
// solutionFlowList = needsolutioninfo.solutionContent.solutionFlowList
// }
//获取交付信息 原始公司注册 start
let bizTypeName
let productType = ab.productType
let orderdeliverySqlData = {
......@@ -1339,20 +1316,6 @@ class RegCenterOrderService {
}
}
}
// console.log('reg +++ deliveryContent+++',deliveryContent)
// if (!deliveryContent) {
// return system.getResultFail(-402, "方案交付信息有误");
// }
// if(needsolutioninfo){
// if (this.regStatus[needsolutioninfo.solutionContent.status] && this.regStatus[needsolutioninfo.solutionContent.status] > ab.ApplicationStatus) {
// return system.getResultFail(-403, "操作失败，交付流程未按顺序执行");
// }
// if (this.regStatus[needsolutioninfo.solutionContent.ApplicationStatus] && this.regStatus[needsolutioninfo.solutionContent.ApplicationStatus] == ab.ApplicationStatus) {
// return system.getResultFail(-405, "操作失败，该流程状态已提交，不能重复提交");
// }
// var solutionFlowList = needsolutioninfo.solutionContent.solutionFlowList || [];
// }
var orderInfo = await this.orderinfoDao.model.findOne({
attributes: ["uapp_id", "channelOrderNo"],
where: { orderNo: ab.orderNo }, raw: true
......@@ -1362,76 +1325,6 @@ class RegCenterOrderService {
var uappId = orderInfo.uapp_id;
var channelOrderNo = orderInfo.channelOrderNo
}
//2021-5-18区分套餐与非套餐改版之前非套餐的原有数据 start
// if (ab.ApplicationStatus == 702) {//材料收集环节
// if (needsolutioninfo.solutionContent.status != "PAID") {
// return system.getResultFail(-702, "交付流程错误，请先完成支付");
// }
// deliveryContent['ApplicationStatus'] = 702;
// solutionFlowList.push({
// file: ab.OfficialFileURL || "",
// status: "COLLECTING", statusName: this.regSolutionStatus.COLLECTING, updated_at: new Date()
// });
// deliveryContent.status = "COLLECTING";
// deliveryContent.statusName = this.regSolutionStatus.COLLECTING;
// }
// if (ab.ApplicationStatus == 703) {//工商审核环节
// var afterStatusList = [//用户支付后的流程状态
// "COLLECTING", "AUDITING", "ENGRAVING" ,"SUCCESS"
// ];
// if (!deliveryContent.status || afterStatusList.indexOf(deliveryContent.status) < 0){
// return system.getResultFail(-703, "交付流程错误，请先完成材料收集");
// }
// if (deliveryContent.status == "SUCCESS") {
// return system.getResultFail(-706, "该方案已完成，不可更改");
// }
// deliveryContent['ApplicationStatus'] = 703;
// solutionFlowList.push({
// file: ab.OfficialFileURL || "",
// status: "AUDITING", statusName: this.regSolutionStatus.AUDITING, updated_at: new Date()
// });
// deliveryContent.status = "AUDITING";
// deliveryContent.statusName = this.regSolutionStatus.AUDITING;
// console.log('deliveryContent-----sss---',deliveryContent)
// console.log('deliveryContent-----ss+++',typeof(deliveryContent))
// deliveryContent['deliveryContent'] = deliveryContents
// }
// if (ab.ApplicationStatus == 704) {//刻章环节
// var afterStatusList = [//用户支付后的流程状态
// "COLLECTING", "AUDITING", "ENGRAVING" ,"SUCCESS"
// ];
// if (!deliveryContent.status || afterStatusList.indexOf(deliveryContent.status) < 0){
// return system.getResultFail(-704, "交付流程错误，请先工商审核");
// }
// if (deliveryContent.status == "SUCCESS") {
// return system.getResultFail(-707, "该方案已完成，不可更改");
// }
// deliveryContent['ApplicationStatus'] = 704;
// solutionFlowList.push({
// file: ab.OfficialFileURL || "",
// status: "ENGRAVING", statusName: this.regSolutionStatus.ENGRAVING, updated_at: new Date()
// });
// deliveryContent.status = "ENGRAVING";
// deliveryContent.statusName = this.regSolutionStatus.ENGRAVING;
// }
// if (ab.ApplicationStatus == 705) {//已完成
// if (deliveryContent.status != "ENGRAVING") {
// return system.getResultFail(-705, "交付流程错误，请先刻章");
// }
// if (deliveryContent.status == "SUCCESS") {
// return system.getResultFail(-708, "该方案已完成，不可更改");
// }
// deliveryContent['ApplicationStatus'] = 705;
// solutionFlowList.push({
// file: ab.OfficialFileURL || "",
// status: "SUCCESS", statusName: this.regSolutionStatus.SUCCESS, updated_at: new Date()
// });
// deliveryContent.status = "SUCCESS";
// needsolutioninfo.status = "ywc";
// deliveryContent.statusName = this.regSolutionStatus.SUCCESS;
// }
//2021-5-18区分套餐与非套餐改版之前非套餐的原有数据 end
//2021-5-18 新增百度公司注册与公司注册套餐区分 start
if (ab.consultType && ab.consultType == "GSREG") {//公司注册
......@@ -1632,86 +1525,89 @@ class RegCenterOrderService {
}
orderdelivery = await this.orderdeliveryDao.customQuery(orderdeliveryQuery, QueryDatas)
console.log('orderdelivery++orderdelivery++++++', orderdelivery)
let gszzDeliveryStatus
let yhkhDeliveryStatus
let swbdDeliveryStatus
//todo 推送云服订单所有交付单状态为完成时订单状态为完成的判断 以下所有注释都是相关代码
// let gszzDeliveryStatus
// let yhkhDeliveryStatus
// let swbdDeliveryStatus
let gszzDeliveryStatus2
let yhkhDeliveryStatus2
let swbdDeliveryStatus2
let dljzDeliveryStatus2
let dzfwDeliveryStatus2
let update_at = new Date().Format("yyyy-MM-dd hh:mm:ss")
let deliveryFlag
let deliveryFlag2
// let gszzDeliveryStatus2
// let yhkhDeliveryStatus2
// let swbdDeliveryStatus2
// let dljzDeliveryStatus2
// let dzfwDeliveryStatus2
// let update_at = new Date().Format("yyyy-MM-dd hh:mm:ss")
// var deliveryFlag
// var deliveryFlag2
if (orderdelivery) {
orderdelivery = orderdelivery[0]
orderdelivery["bizId"] = ab.bizId;
orderdelivery['uapp_id'] = uappId;
orderdelivery['channelOrderNo'] = channelOrderNo;
if (ab.consultType && ab.consultType == "QYJYTC1") {
switch (ab.productType) {
case "GSZZ":
if (deliveryContent["GSZZ"] && deliveryContent["GSZZ"].status == 705) {
gszzDeliveryStatus = 705
}
break;
case "YHKH":
if (deliveryContent["YHKH"] && deliveryContent["YHKH"].status == 705) {
yhkhDeliveryStatus = 705
}
break;
case "SWBD":
if (deliveryContent["SWBD"] && deliveryContent["SWBD"].status == 705) {
swbdDeliveryStatus = 705
}
break;
}
if (gszzDeliveryStatus && yhkhDeliveryStatus && swbdDeliveryStatus && 705 == swbdDeliveryStatus == yhkhDeliveryStatus == gszzDeliveryStatus) {
let sql = "UPDATE `c_order_info` SET orderStatusName ='已完成',orderStatus= 8,updated_at='" + update_at + "' where orderNo ='" + ab.orderNo + "'";
let updateOrderInfo = await this.orderdeliveryDao.customInsert(sql);
if (updateOrderInfo) {
deliveryFlag = 200
}
}
}
// if (ab.consultType && ab.consultType == "QYJYTC1") {
// switch (ab.productType) {
// case "GSZZ":
// if (deliveryContent["GSZZ"] && deliveryContent["GSZZ"].status == 705) {
// gszzDeliveryStatus = 705
// }
// break;
// case "YHKH":
// if (deliveryContent["YHKH"] && deliveryContent["YHKH"].status == 705) {
// yhkhDeliveryStatus = 705
// }
// break;
// case "SWBD":
// if (deliveryContent["SWBD"] && deliveryContent["SWBD"].status == 705) {
// swbdDeliveryStatus = 705
// }
// break;
// }
// if (gszzDeliveryStatus && yhkhDeliveryStatus && swbdDeliveryStatus && 705 == swbdDeliveryStatus == yhkhDeliveryStatus == gszzDeliveryStatus) {
// let sql = "UPDATE `c_order_info` SET orderStatusName ='已完成',orderStatus= 8,updated_at='" + update_at + "' where orderNo ='" + ab.orderNo + "'";
// let updateOrderInfo = await this.orderdeliveryDao.customInsert(sql);
// if (updateOrderInfo) {
// deliveryFlag = 200
// orderdelivery['deliveryFlag'] = deliveryFlag;
// }
// }
// }
if (ab.consultType && ab.consultType == "QYJYTC2") {
switch (ab.productType) {
case "GSZZ":
if (deliveryContent["GSZZ"] && deliveryContent["GSZZ"].status == 705) {
gszzDeliveryStatus2 = 705
}
break;
case "YHKH":
if (deliveryContent["YHKH"] && deliveryContent["YHKH"].status == 705) {
yhkhDeliveryStatus2 = 705
}
break;
case "SWBD":
if (deliveryContent["SWBD"] && deliveryContent["SWBD"].status == 705) {
swbdDeliveryStatus2 = 705
}
break;
case "DLJZ":
if (deliveryContent["DLJZ"] && deliveryContent["DLJZ"].status == 705) {
dljzDeliveryStatus2 = 705
}
break;
case "DZFW":
if (deliveryContent["DZFW"] && deliveryContent["DZFW"].status == 705) {
dzfwDeliveryStatus2 = 705
}
break;
}
if (gszzDeliveryStatus2 && yhkhDeliveryStatus2 && swbdDeliveryStatus2 && dljzDeliveryStatus2 && dzfwDeliveryStatus2 && 705 == swbdDeliveryStatus2 == yhkhDeliveryStatus2 == gszzDeliveryStatus2 == dljzDeliveryStatus2 == dzfwDeliveryStatus2) {
let sql2 = "UPDATE `c_order_info` SET orderStatusName ='已完成',orderStatus= 8,updated_at='" + update_at + "' where orderNo ='" + ab.orderNo + "'";
let updateOrderInfo2 = await this.orderdeliveryDao.customInsert(sql2);
if (updateOrderInfo2) {
deliveryFlag2 = 200
}
}
}
// if (ab.consultType && ab.consultType == "QYJYTC2") {
// switch (ab.productType) {
// case "GSZZ":
// if (deliveryContent["GSZZ"] && deliveryContent["GSZZ"].status == 705) {
// gszzDeliveryStatus2 = 705
// }
// break;
// case "YHKH":
// if (deliveryContent["YHKH"] && deliveryContent["YHKH"].status == 705) {
// yhkhDeliveryStatus2 = 705
// }
// break;
// case "SWBD":
// if (deliveryContent["SWBD"] && deliveryContent["SWBD"].status == 705) {
// swbdDeliveryStatus2 = 705
// }
// break;
// case "DLJZ":
// if (deliveryContent["DLJZ"] && deliveryContent["DLJZ"].status == 705) {
// dljzDeliveryStatus2 = 705
// }
// break;
// case "DZFW":
// if (deliveryContent["DZFW"] && deliveryContent["DZFW"].status == 705) {
// dzfwDeliveryStatus2 = 705
// }
// break;
// }
// if (gszzDeliveryStatus2 && yhkhDeliveryStatus2 && swbdDeliveryStatus2 && dljzDeliveryStatus2 && dzfwDeliveryStatus2 && 705 == swbdDeliveryStatus2 == yhkhDeliveryStatus2 == gszzDeliveryStatus2 == dljzDeliveryStatus2 == dzfwDeliveryStatus2) {
// let sql2 = "UPDATE `c_order_info` SET orderStatusName ='已完成',orderStatus= 8,updated_at='" + update_at + "' where orderNo ='" + ab.orderNo + "'";
// let updateOrderInfo2 = await this.orderdeliveryDao.customInsert(sql2);
// if (updateOrderInfo2) {
// deliveryFlag2 = 200
// orderdelivery['deliveryFlag2'] = deliveryFlag2;
// }
// }
// }
}
console.log('orderdelivery++', orderdelivery)
return system.getResultSuccess(orderdelivery);
......
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