Skip to content

Z
zhichan
Commit 60cf842f by 王栋源
Options

wdy

parent f042c280
Showing with 34 additions and 30 deletions
center-order/app/base/service/impl/dbcorder/orderinfoSve.js
...@@ -246,7 +246,7 @@ class OrderInfoService extends ServiceBase { ...@@ -246,7 +246,7 @@ class OrderInfoService extends ServiceBase {
quantity: actionBody.quantity,// 订单数量（即产品的倍数，默认值为1） quantity: actionBody.quantity,// 订单数量（即产品的倍数，默认值为1）
opPayType: "00",// 操作付款类型:00: 创建订单, 10: 补单 opPayType: "00",// 操作付款类型:00: 创建订单, 10: 补单
serviceItemSnapshot: JSON.stringify(actionBody.product_info),//产品快照 serviceItemSnapshot: JSON.stringify(actionBody.product_info),//产品快照
orderSnapshot:JSON.stringify(actionBody.registerData) orderSnapshot: JSON.stringify(actionBody.registerData)
}; };
var orderProduct = await this.orderproductDao.create(orderProductObj, t);//订单产品 var orderProduct = await this.orderproductDao.create(orderProductObj, t);//订单产品
var orderReceiptVoucherObj = { var orderReceiptVoucherObj = {
...@@ -525,12 +525,16 @@ class OrderInfoService extends ServiceBase { ...@@ -525,12 +525,16 @@ class OrderInfoService extends ServiceBase {
return await self.db.transaction(async function (t) { return await self.db.transaction(async function (t) {
var orderNo = await self.getBusUid("ot" + pobj.appInfo.uapp_id); var orderNo = await self.getBusUid("ot" + pobj.appInfo.uapp_id);
if (pobj.actionBody.channelOrder && pobj.actionBody.channelOrder.channelOrderNo) { if (pobj.actionBody.channelOrder && pobj.actionBody.channelOrder.channelOrderNo) {
var count = await self.dao.findCount({ where: { channelOrderNo: pobj.actionBody.channelOrder.channelOrderNo } }); var rtn = await self.dao.model.findOne({ where: { channelOrderNo: pobj.actionBody.channelOrder.channelOrderNo } });
if (count > 0) { if (rtn) {
return system.getResultFail(-1, "订单不能重复创建s"); return system.getResultSuccess({
orderNo: rtn.orderNo,
channelServiceNo: pobj.actionBody.channelOrder.channelServiceNo || rtn.orderNo,
channelOrderNo: pobj.actionBody.channelOrder.channelOrderNo || rtn.orderNo,
channelParams: pobj.actionBody.channelOrder.channelParams || ""
});
} }
} }
var item = await self.createOrder(pobj, orderNo, t);
return system.getResultSuccess({ return system.getResultSuccess({
orderNo: orderNo, orderNo: orderNo,
channelServiceNo: pobj.actionBody.channelOrder.channelServiceNo || orderNo, channelServiceNo: pobj.actionBody.channelOrder.channelServiceNo || orderNo,
...@@ -541,7 +545,7 @@ class OrderInfoService extends ServiceBase { ...@@ -541,7 +545,7 @@ class OrderInfoService extends ServiceBase {
} }
async createH5Order(pobj){ async createH5Order(pobj) {
var self = this; var self = this;
if (!pobj.actionBody.registerData) { if (!pobj.actionBody.registerData) {
return system.getResult(null, "注册信息为空"); return system.getResult(null, "注册信息为空");
...@@ -1086,21 +1090,21 @@ class OrderInfoService extends ServiceBase { ...@@ -1086,21 +1090,21 @@ class OrderInfoService extends ServiceBase {
var list = await this.customQuery(sql, paramWhere); var list = await this.customQuery(sql, paramWhere);
// 2020 0714 lin 新增 用来处理订单列表的进入详情权限 // 2020 0714 lin 新增 用来处理订单列表的进入详情权限
for(let i = 0;i < list.length;i++) { for (let i = 0; i < list.length; i++) {
// 如果没有交付信息跳出 // 如果没有交付信息跳出
if(!list[i]["deliveryContent"]){ if (!list[i]["deliveryContent"]) {
list[i]["isDetail"] = 0;
delete list[i]["deliveryContent"];
continue;
}
// 如果交付信息状态不等于 待确认方案 || 方案不通过 判断为可进入详情
if(list[i]["deliveryContent"]["deliveryStatus"] != "dqrfa" && list[i]["deliveryContent"]["deliveryStatus"] != "fabtg") {
list[i]["isDetail"] = 1;
delete list[i]["deliveryContent"];
continue;
}
list[i]["isDetail"] = 0; list[i]["isDetail"] = 0;
delete list[i]["deliveryContent"]; delete list[i]["deliveryContent"];
continue;
}
// 如果交付信息状态不等于 待确认方案 || 方案不通过 判断为可进入详情
if (list[i]["deliveryContent"]["deliveryStatus"] != "dqrfa" && list[i]["deliveryContent"]["deliveryStatus"] != "fabtg") {
list[i]["isDetail"] = 1;
delete list[i]["deliveryContent"];
continue;
}
list[i]["isDetail"] = 0;
delete list[i]["deliveryContent"];
} }
var result = system.getResultSuccess(list); var result = system.getResultSuccess(list);
...@@ -1518,20 +1522,20 @@ class OrderInfoService extends ServiceBase { ...@@ -1518,20 +1522,20 @@ class OrderInfoService extends ServiceBase {
if (deliveryInfoResult && deliveryInfoResult.status == 0) { if (deliveryInfoResult && deliveryInfoResult.status == 0) {
resultParams.delivery_content = deliveryInfoResult.data; resultParams.delivery_content = deliveryInfoResult.data;
// 2020 0717 lin新增 在回调处增加客户销售分布地区统计 // 2020 0717 lin新增 在回调处增加客户销售分布地区统计
if(deliveryInfoResult.data.apply) { if (deliveryInfoResult.data.apply) {
if(deliveryInfoResult.data.apply.applyAddr) { if (deliveryInfoResult.data.apply.applyAddr) {
var applyAddr = deliveryInfoResult.data.apply.applyAddr var applyAddr = deliveryInfoResult.data.apply.applyAddr
// 获取地址数组 该setting数组 与orderRegion province相同 // 获取地址数组 该setting数组 与orderRegion province相同
var addArr = settings.addArr(); var addArr = settings.addArr();
for(var i = 0;i < addArr.length;i++) { for (var i = 0; i < addArr.length; i++) {
if(applyAddr.indexOf(addArr[i]) >= 0 ){ if (applyAddr.indexOf(addArr[i]) >= 0) {
var sql = "update c_order_region set count=count+1 where province=:province"; var sql = "update c_order_region set count=count+1 where province=:province";
// 修改条件 省名字相同，appid相同 // 修改条件 省名字相同，appid相同
var paramWhere = { where:{province: addArr[i],uapp_id:item.uapp_id}}; var paramWhere = { where: { province: addArr[i], uapp_id: item.uapp_id } };
var updateFields = { var updateFields = {
count: sequelize.literal('count+1') count: sequelize.literal('count+1')
} }
await this.orderRegionDao.updateByWhere(updateFields, paramWhere) await this.orderRegionDao.updateByWhere(updateFields, paramWhere)
} }
} }
} }
......
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