Commit 05bec39f by 宋毅

tj

parent 2f7152e1
...@@ -328,6 +328,12 @@ class OrderInfoService extends ServiceBase { ...@@ -328,6 +328,12 @@ class OrderInfoService extends ServiceBase {
var self = this; var self = this;
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) {
var count = await this.dao.findCount({ where: { channelOrderNo: pobj.actionBody.channelOrder.channelOrderNo } });
if (count > 0) {
return system.getResult(null, "订单不能重复创建,30220");
}
}
var item = await self.createOrder(pobj, orderNo, t); var item = await self.createOrder(pobj, orderNo, t);
return system.getResultSuccess({ return system.getResultSuccess({
orderNo: orderNo, orderNo: orderNo,
...@@ -414,10 +420,10 @@ class OrderInfoService extends ServiceBase { ...@@ -414,10 +420,10 @@ class OrderInfoService extends ServiceBase {
} }
//接收方案状态及支付信息 //接收方案状态及支付信息
async receiveSolutionPayInfo(channelSolutionNo,status,orderPrice,self,t){ async receiveSolutionPayInfo(channelSolutionNo, status, orderPrice, self, t) {
var needsolutioninfo = await self.needsolutionDao.findOne({ channelSolutionNo: channelSolutionNo }, t); var needsolutioninfo = await self.needsolutionDao.findOne({ channelSolutionNo: channelSolutionNo }, t);
if(!needsolutioninfo || !needsolutioninfo.id){ if (!needsolutioninfo || !needsolutioninfo.id) {
return system.getResultFail(-400,"未知方案"); return system.getResultFail(-400, "未知方案");
} }
var solutionContent = needsolutioninfo.solutionContent; var solutionContent = needsolutioninfo.solutionContent;
solutionContent = JSON.parse(solutionContent); solutionContent = JSON.parse(solutionContent);
......
已经使用的编码汇总: 已经使用的编码汇总:
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
30190 30190
30200 30200
30210 30210
30220
======================================================== ========================================================
......
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