Skip to content

Z
zhichan
Commit 532c1414 by 宋毅
Options

tj

parent b0475e73
Showing with 74 additions and 50 deletions
center-order/app/base/service/impl/dbcorder/orderinfoSve.js
...@@ -222,30 +222,21 @@ class OrderInfoService extends ServiceBase { ...@@ -222,30 +222,21 @@ class OrderInfoService extends ServiceBase {
} }
var price_item = actionBody.product_info.price_item; var price_item = actionBody.product_info.price_item;
var self = this; var self = this;
var nclList = [];
for (let index = 0; index < deliveryData.nclones.length; index++) { for (let index = 0; index < deliveryData.nclones.length; index++) {
var nclones = deliveryData.nclones[index]; var nclThree = deliveryData.nclones[index].nclThree;
var nclThree = nclones.nclThree; deliveryData.nclones[index].nclCount = nclThree.length;
var tempNclones = { deliveryData.nclones[index].nclPublicExpense = nclThree.length < 10 ? (Number(price_item.price) * 10) : (Number(price_item.price) * nclThree.length);
ncloneCode: nclones.code, deliveryData.nclones[index].tmStatus = deliveryStatus;//商标交付状态
ncloneName: nclones.name, deliveryData.nclones[index].tmStatusName = deliveryStatusName;
nclThree: nclThree, deliveryData.nclones[index].submitTime = "";
nclCount: nclThree.length, deliveryData.nclones[index].deliveryType = pobj.appInfo.delivery_type;//应用数据操作类型：00独立，10全委托
nclPublicExpense: Number(price_item.price) * nclThree.length, deliveryData.nclones[index].tbCode = await self.getBusUid("tb" + pobj.appInfo.uapp_id);//提报号(自动生成)
tmStatus: deliveryStatus,//商标交付状态 deliveryData.nclones[index].tmRegistNum = "";
tmStatusName: deliveryStatusName,
submitTime: "",
deliveryType: pobj.appInfo.delivery_type,//应用数据操作类型：00独立，10全委托
tbCode: await self.getBusUid("tb" + pobj.appInfo.uapp_id)//提报号(自动生成)
}
nclList.push(tempNclones);
} }
pobj.actionBody.deliveryData.deliveryStatus = deliveryStatus; pobj.actionBody.deliveryData.deliveryStatus = deliveryStatus;
pobj.actionBody.deliveryData.deliveryStatusName = deliveryStatusName; pobj.actionBody.deliveryData.deliveryStatusName = deliveryStatusName;
pobj.actionBody.deliveryData.notes = actionBody.notes || ""; // 订单备注 pobj.actionBody.deliveryData.notes = actionBody.notes || ""; // 订单备注
pobj.actionBody.deliveryData.opNotes = ""; //操作备注 pobj.actionBody.deliveryData.opNotes = ""; //操作备注
pobj.actionBody.deliveryData.nclList = nclList;
delete pobj.actionBody.deliveryData["nclones"];
return system.getResultSuccess(); return system.getResultSuccess();
} }
...@@ -508,6 +499,11 @@ class OrderInfoService extends ServiceBase { ...@@ -508,6 +499,11 @@ class OrderInfoService extends ServiceBase {
if (!orderItem) { if (!orderItem) {
return system.getResult(null, "修改失败，修改的数据为空，30100"); return system.getResult(null, "修改失败，修改的数据为空，30100");
} }
var orderProductItem = await this.orderproductDao.getItemInfoByOrderNo(actionBody.orderNo);
if (!orderProductItem) {
return system.getResult(null, "修改失败，订单对应的产品数据为空，30105");
}
var product_info = JSON.parse(orderProductItem.serviceItemSnapshot);
if (orderItem.orderStatus == 4) { if (orderItem.orderStatus == 4) {
return system.getResult(null, "服务中的订单不能进行修改，30110"); return system.getResult(null, "服务中的订单不能进行修改，30110");
} }
...@@ -522,32 +518,55 @@ class OrderInfoService extends ServiceBase { ...@@ -522,32 +518,55 @@ class OrderInfoService extends ServiceBase {
if (!itemResult.data || Object.keys(itemResult.data).length == 0) { if (!itemResult.data || Object.keys(itemResult.data).length == 0) {
return system.getResult(null, "修改失败，修改的数据为空，30020"); return system.getResult(null, "修改失败，修改的数据为空，30020");
} }
var self = this;
var tipsMsg = ""; var tipsMsg = "";
var apply = actionBody.apply; var apply = actionBody.apply;
if (apply) { if (apply) {
var dbApply = itemResult.data.apply; var dbApply = itemResult.data.apply;
var applyKeys = Object.keys(apply); var applyKeys = Object.keys(apply);
if (apply && dbApply && applyKeys.length > 0) { if (dbApply && applyKeys.length > 0) {
for (let index = 0; index < applyKeys.length; index++) { for (let index = 0; index < applyKeys.length; index++) {
const aKey = applyKeys[index]; const aKey = applyKeys[index];
if (apply[aKey] != dbApply[aKey]) { if (apply[aKey] != dbApply[aKey]) {
itemResult.data.apply[aKey] = apply[aKey]; itemResult.data.apply[aKey] = apply[aKey];
} }
} }
var deliveryStatus = "dsccl";
var deliveryStatusName = "待上传材料";
if (itemResult.data.apply.customerType == "ent") {
if (itemResult.data.apply.businessLicensePdf && itemResult.data.apply.gzwtsUrl) {
deliveryStatus = "dsh";
deliveryStatusName = "待审核";
}
} else {
if (itemResult.data.apply.businessLicensePdf && itemResult.data.apply.gzwtsUrl && itemResult.data.apply.identityCardPdf) {
deliveryStatus = "dsh";
deliveryStatusName = "待审核";
}
}
itemResult.data.deliveryStatus = deliveryStatus;
itemResult.data.deliveryStatusName = deliveryStatusName;
for (let j = 0; j < itemResult.data.nclones.length; j++) {
itemResult.data.nclones[j].tmStatus = deliveryStatus;//商标交付状态
itemResult.data.nclones[j].tmStatusName = deliveryStatusName;
}
//作为推送商标状态进行推送
actionBody.deliveryStatus = deliveryStatus;
actionBody.deliveryStatusName = deliveryStatusName;
} }
} }
var tm = actionBody.tm; var tm = actionBody.tm;
if (tm) { if (tm) {
var dbTm = itemResult.data.tm; var dbTm = itemResult.data.tm;
var tmKeys = Object.keys(tm); var tmKeys = Object.keys(tm);
if (tm && dbTm && tmKeys.length > 0) { if (dbTm && tmKeys.length > 0) {
for (let index = 0; index < tmKeys.length; index++) { for (let i = 0; i < tmKeys.length; i++) {
const aKey = tmKeys[index]; const iKey = tmKeys[i];
if (!tm[aKey]) { if (!tm[iKey]) {
tipsMsg = "修改失败，" + aKey + "不能为空，30030"; tipsMsg = "修改失败，" + iKey + "不能为空，30030";
} }
if (tm[aKey] && tm[aKey] != dbTm[aKey]) { if (tm[iKey] && tm[iKey] != dbTm[iKey]) {
itemResult.data.tm[aKey] = tm[aKey]; itemResult.data.tm[iKey] = tm[iKey];
} }
} }
} }
...@@ -555,38 +574,43 @@ class OrderInfoService extends ServiceBase { ...@@ -555,38 +574,43 @@ class OrderInfoService extends ServiceBase {
if (tipsMsg) { if (tipsMsg) {
return system.getResult(null, tipsMsg); return system.getResult(null, tipsMsg);
} }
var nclThree = actionBody.nclThree; var tempNclList = actionBody.nclones;
if (nclThree && nclThree.length > 0) { if (tempNclList && tempNclList.length > 0) {
var dbNclList = itemResult.data.nclList; var dbNclList = itemResult.data.nclones;
if (!actionBody.tbCode) { if (dbNclList.length < tempNclList.length) {
return system.getResult(null, "修改失败，tbCode不能为空，30040"); return system.getResult(null, "修改失败，尼斯大类应该为：" + dbNclList.length + "个大类，当前选择了" + tempNclList.length + "个大类，30040");
}
if (!actionBody.ncloneCode) {
return system.getResult(null, "修改失败，ncloneCode不能为空，30050");
} }
if (!actionBody.ncloneName) { var dbNclThreeCount = 0;
return system.getResult(null, "修改失败，ncloneName不能为空，30060"); for (let k = 0; k < dbNclList.length; k++) {
const kItem = dbNclList[k];
dbNclThreeCount = dbNclThreeCount + Number(kItem.nclCount);
} }
var dataIndex = dbNclList.findIndex(f => f.tbCode == actionBody.tbCode); var nclThreeCount = 0;
if (dataIndex < 0) { for (let h = 0; h < tempNclList.length; h++) {
return system.getResult(null, "修改失败，tbCode有误，30070"); const nclThree = tempNclList[h].nclThree;
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].tmStatus = deliveryStatus;//商标交付状态
tempNclList[h].tmStatusName = deliveryStatusName;
tempNclList[h].submitTime = "";
tempNclList[h].deliveryType = pobj.appInfo.delivery_type;//应用数据操作类型：00独立，10全委托
tempNclList[h].tbCode = await self.getBusUid("tb" + pobj.appInfo.uapp_id);//提报号(自动生成)
tempNclList[h].tmRegistNum = "";
tempNclList[h].nclThree = nclThree;
nclThreeCount = nclThreeCount + nclThree.length;
} }
var putItemData = dbNclList[dataIndex]; if (dbNclThreeCount < nclThreeCount) {
if (putItemData.nclThree.length < nclThree.length) { var tempDbNclThreeCount = dbNclList.length * 10;
return system.getResult(null, "尼斯小项数量有误，数量应小于等于" + putItemData.nclThree.length + "，30080"); if (tempDbNclThreeCount < nclThreeCount) {
return system.getResult(null, "修改失败，尼斯应该为：" + dbNclThreeCount + "个小项，当前选择了" + nclThreeCount + "个小项，30050");
}
} }
itemResult.data.nclList[dataIndex].nclThree = nclThree; itemResult.data.nclones = tempNclList;
itemResult.data.nclList[dataIndex].ncloneCode = actionBody.ncloneCode;
itemResult.data.nclList[dataIndex].ncloneName = actionBody.ncloneName;
itemResult.data.nclList[dataIndex].nclCount = nclThree.length;
} }
this.putOrderDelivery(itemResult.data, actionBody.orderNo); this.putOrderDelivery(itemResult.data, actionBody.orderNo);
var resultParams = { orderStatus: orderItem.orderStatus }; var resultParams = { orderStatus: orderItem.orderStatus };
if (orderItem.orderStatus < 4) { if (orderItem.orderStatus < 4) {
var orderProductItem = await this.orderproductDao.getItemInfoByOrderNo(actionBody.orderNo); resultParams.product_info = product_info;
if (orderProductItem) {
resultParams.product_info = JSON.parse(orderProductItem.serviceItemSnapshot);
}
} }
return system.getResultSuccess(resultParams); return system.getResultSuccess(resultParams);
} }
......
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