Skip to content

Z
zhichan
Commit 30ede529 by 宋毅
Options

tj

parent 532c1414
Showing with 45 additions and 11 deletions
center-order/app/base/service/impl/dbcorder/orderinfoSve.js
...@@ -209,15 +209,30 @@ class OrderInfoService extends ServiceBase { ...@@ -209,15 +209,30 @@ class OrderInfoService extends ServiceBase {
} }
var deliveryStatus = "dsccl"; var deliveryStatus = "dsccl";
var deliveryStatusName = "待上传材料"; var deliveryStatusName = "待上传材料";
var deliveryStatusList = [{
deliveryStatus: "dsccl",
deliveryStatusName: "待上传材料",
deliveryUpdated: new Date()
}];
if (deliveryData.apply.customerType == "ent") { if (deliveryData.apply.customerType == "ent") {
if (deliveryData.apply.businessLicensePdf && deliveryData.apply.gzwtsUrl) { if (deliveryData.apply.businessLicensePdf && deliveryData.apply.gzwtsUrl) {
deliveryStatus = "dsh"; deliveryStatus = "dsh";
deliveryStatusName = "待审核"; deliveryStatusName = "待审核";
deliveryStatusList.push({
deliveryStatus: deliveryStatus,
deliveryStatusName: deliveryStatusName,
deliveryUpdated: new Date()
});
} }
} else { } else {
if (deliveryData.apply.businessLicensePdf && deliveryData.apply.gzwtsUrl && deliveryData.apply.identityCardPdf) { if (deliveryData.apply.businessLicensePdf && deliveryData.apply.gzwtsUrl && deliveryData.apply.identityCardPdf) {
deliveryStatus = "dsh"; deliveryStatus = "dsh";
deliveryStatusName = "待审核"; deliveryStatusName = "待审核";
deliveryStatusList.push({
deliveryStatus: deliveryStatus,
deliveryStatusName: deliveryStatusName,
deliveryUpdated: new Date()
});
} }
} }
var price_item = actionBody.product_info.price_item; var price_item = actionBody.product_info.price_item;
...@@ -233,8 +248,10 @@ class OrderInfoService extends ServiceBase { ...@@ -233,8 +248,10 @@ class OrderInfoService extends ServiceBase {
deliveryData.nclones[index].tbCode = await self.getBusUid("tb" + pobj.appInfo.uapp_id);//提报号(自动生成) deliveryData.nclones[index].tbCode = await self.getBusUid("tb" + pobj.appInfo.uapp_id);//提报号(自动生成)
deliveryData.nclones[index].tmRegistNum = ""; deliveryData.nclones[index].tmRegistNum = "";
} }
pobj.actionBody.deliveryData.deliveryStatus = deliveryStatus; pobj.actionBody.deliveryData.deliveryStatus = deliveryStatus;
pobj.actionBody.deliveryData.deliveryStatusName = deliveryStatusName; pobj.actionBody.deliveryData.deliveryStatusName = deliveryStatusName;
pobj.actionBody.deliveryData.deliveryStatusList = deliveryStatusList;
pobj.actionBody.deliveryData.notes = actionBody.notes || ""; // 订单备注 pobj.actionBody.deliveryData.notes = actionBody.notes || ""; // 订单备注
pobj.actionBody.deliveryData.opNotes = ""; //操作备注 pobj.actionBody.deliveryData.opNotes = ""; //操作备注
return system.getResultSuccess(); return system.getResultSuccess();
...@@ -544,11 +561,25 @@ class OrderInfoService extends ServiceBase { ...@@ -544,11 +561,25 @@ class OrderInfoService extends ServiceBase {
deliveryStatusName = "待审核"; deliveryStatusName = "待审核";
} }
} }
itemResult.data.deliveryStatus = deliveryStatus; if (itemResult.data.deliveryStatus != deliveryStatus) {
itemResult.data.deliveryStatusName = deliveryStatusName; itemResult.data.deliveryStatus = deliveryStatus;
for (let j = 0; j < itemResult.data.nclones.length; j++) { itemResult.data.deliveryStatusName = deliveryStatusName;
itemResult.data.nclones[j].tmStatus = deliveryStatus;//商标交付状态 for (let j = 0; j < itemResult.data.nclones.length; j++) {
itemResult.data.nclones[j].tmStatusName = deliveryStatusName; itemResult.data.nclones[j].tmStatus = deliveryStatus;//商标交付状态
itemResult.data.nclones[j].tmStatusName = deliveryStatusName;
}
var deliveryStatusList = itemResult.data.deliveryStatusList;
if (deliveryStatusList && deliveryStatusList.length > 0) {
var deliveryStatusIndex = deliveryStatusList.findIndex(f => f.deliveryStatus == deliveryStatus);
if (deliveryStatusIndex < 0) {
deliveryStatusList.push({
deliveryStatus: deliveryStatus,
deliveryStatusName: deliveryStatusName,
deliveryUpdated: new Date()
});
itemResult.data.deliveryStatusList = deliveryStatusList;
}
}
} }
//作为推送商标状态进行推送 //作为推送商标状态进行推送
actionBody.deliveryStatus = deliveryStatus; actionBody.deliveryStatus = deliveryStatus;
...@@ -590,8 +621,8 @@ class OrderInfoService extends ServiceBase { ...@@ -590,8 +621,8 @@ class OrderInfoService extends ServiceBase {
const nclThree = tempNclList[h].nclThree; const nclThree = tempNclList[h].nclThree;
tempNclList[h].nclCount = nclThree.length; tempNclList[h].nclCount = nclThree.length;
tempNclList[h].nclPublicExpense = nclThree.length < 10 ? (Number(product_info.price_item.price) * 10) : (Number(product_info.price_item.price) * nclThree.length); tempNclList[h].nclPublicExpense = nclThree.length < 10 ? (Number(product_info.price_item.price) * 10) : (Number(product_info.price_item.price) * nclThree.length);
tempNclList[h].tmStatus = deliveryStatus;//商标交付状态 tempNclList[h].tmStatus = itemResult.data.deliveryStatus || "";//商标交付状态
tempNclList[h].tmStatusName = deliveryStatusName; tempNclList[h].tmStatusName = itemResult.data.deliveryStatusName || "";
tempNclList[h].submitTime = ""; tempNclList[h].submitTime = "";
tempNclList[h].deliveryType = pobj.appInfo.delivery_type;//应用数据操作类型：00独立，10全委托 tempNclList[h].deliveryType = pobj.appInfo.delivery_type;//应用数据操作类型：00独立，10全委托
tempNclList[h].tbCode = await self.getBusUid("tb" + pobj.appInfo.uapp_id);//提报号(自动生成) tempNclList[h].tbCode = await self.getBusUid("tb" + pobj.appInfo.uapp_id);//提报号(自动生成)
...@@ -606,13 +637,16 @@ class OrderInfoService extends ServiceBase { ...@@ -606,13 +637,16 @@ class OrderInfoService extends ServiceBase {
} }
} }
itemResult.data.nclones = tempNclList; itemResult.data.nclones = tempNclList;
actionBody.nclones = tempNclList;
} }
this.putOrderDelivery(itemResult.data, actionBody.orderNo); this.putOrderDelivery(itemResult.data, actionBody.orderNo);
var resultParams = { orderStatus: orderItem.orderStatus };
delete actionBody["isGetContact"];
actionBody.orderStatus = orderItem.orderStatus;
if (orderItem.orderStatus < 4) { if (orderItem.orderStatus < 4) {
resultParams.product_info = product_info; actionBody.product_info = product_info;
} }
return system.getResultSuccess(resultParams); return system.getResultSuccess(actionBody);
} }
putOrderDelivery(data, orderNo) {//修改交付信息 putOrderDelivery(data, orderNo) {//修改交付信息
...@@ -853,7 +887,7 @@ class OrderInfoService extends ServiceBase { ...@@ -853,7 +887,7 @@ class OrderInfoService extends ServiceBase {
} }
async opOrderPayCallBackTl(parmas, appInfo) {//操作订单付款回调---通联 async opOrderPayCallBackTl(parmas, appInfo) {//操作订单付款回调---通联
var item = await this.dao.getItemStatusByOrderNo(parmas.orderNo); var item = await this.dao.getItemStatusByOrderNo(parmas.orderNo)
if (!item) { if (!item) {
return system.getResult(null, "order data is empty!"); return system.getResult(null, "order data is empty!");
} }
......
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