Commit 3f92db72 by 王栋源

wdy

parent 097b75f1
...@@ -525,9 +525,7 @@ class OrderInfoService extends ServiceBase { ...@@ -525,9 +525,7 @@ 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 rtn = await self.dao.model.findOne({ where: { channelOrderNo: pobj.actionBody.channelOrder.channelOrderNo } }); var rtn = await self.dao.findOne({ channelOrderNo: pobj.actionBody.channelOrder.channelOrderNo }, t);
console.log("-------------------------------------------------------");
console.log(rtn);
if (rtn) { if (rtn) {
return system.getResultSuccess({ return system.getResultSuccess({
orderNo: rtn.orderNo, orderNo: rtn.orderNo,
...@@ -536,6 +534,7 @@ class OrderInfoService extends ServiceBase { ...@@ -536,6 +534,7 @@ class OrderInfoService extends ServiceBase {
channelParams: pobj.actionBody.channelOrder.channelParams || "" channelParams: pobj.actionBody.channelOrder.channelParams || ""
}); });
} }
var item = await self.createOrder(pobj, orderNo, t);
} }
return system.getResultSuccess({ return system.getResultSuccess({
orderNo: orderNo, orderNo: orderNo,
...@@ -632,7 +631,7 @@ class OrderInfoService extends ServiceBase { ...@@ -632,7 +631,7 @@ class OrderInfoService extends ServiceBase {
} }
var item = await self.createOrder(pobj, orderNo, t); var item = await self.createOrder(pobj, orderNo, t);
// needsolutioninfo.status = "ywc"; // needsolutioninfo.status = "ywc";
await self.needsolutionDao.update({id:needsolutioninfo.id,status:"dqr"}, t); await self.needsolutionDao.update({ id: needsolutioninfo.id, status: "dqr" }, t);
self.addOrderDelivery(pobj.actionBody.deliveryData, orderNo); self.addOrderDelivery(pobj.actionBody.deliveryData, orderNo);
return system.getResultSuccess({ return system.getResultSuccess({
orderNo: orderNo, orderNo: orderNo,
......
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