Skip to content

Z
zhichan
Commit 3b14823f by 宋毅
Options

tj

parent 173ed045
Showing with 0 additions and 109 deletions
center-order/app/base/db/impl/dbcorder/orderinfoDao.js
......@@ -15,8 +15,6 @@ class OrderInfoDao extends Dao {
"channelOrderNo",
"channelUserId",
"ownerUserId",
"needNo",
"needNoOrderNo",
"payTime",
"quantity",
"serviceQuantity",
......
center-order/app/base/db/models/dbcorder/orderinfo.js
......@@ -9,8 +9,6 @@ module.exports = (db, DataTypes) => {
channelOrderNo :DataTypes.STRING(1024),// 渠道订单号列表，多个以,隔开
channelUserId :DataTypes.STRING(64), // 渠道用户ID
ownerUserId :DataTypes.STRING(20),// 拥有渠道用户ID
needNo :DataTypes.STRING(64), // 需求单号（即渠道服务单号）
needNoOrderNo :DataTypes.STRING(1024), // 需求订单号 （即渠道服务订单号）
payTime :DataTypes.DATE,// 渠道有支付时间则用渠道的支付时间
quantity :DataTypes.INTEGER,// 订单数量（即产品的倍数，默认值为1）
serviceQuantity :DataTypes.INTEGER,// 订单服务数量（即与订单数量相对应）
......
center-order/app/base/service/impl/dbcorder/orderinfoSve.js
......@@ -31,8 +31,6 @@ class OrderInfoService extends ServiceBase {
channelOrderNo: channelOrder.channelOrderNo || "",//varchar(1024) //渠道订单号列表，多个以,隔开
channelUserId: pobj.userInfo.channel_userId,//varchar(64) //
ownerUserId: pobj.userInfo.channel_userId,//varchar(20) //
needNo: channelOrder.needNo || "",//varchar(64) //需求单号
needNoOrderNo: channelOrder.needNoOrderNo || "",//varchar(64) //需求订单号
payTime: channelOrder.orderStatus && channelOrder.orderStatus == 1 ? payTime : null,//datetime //
quantity: actionBody.quantity,//int(11) //项目订单数量（即服务项目的倍数，默认值为1）
serviceQuantity: 0,//int(11) //项目订单交付数量（即与项目订单数量相对应）
......@@ -193,107 +191,5 @@ class OrderInfoService extends ServiceBase {
}
return system.getResultSuccess();
}
/**
* 数据推送
*/
// async pushData(requestid, params, url, req) {
// var rc = system.getObject("util.execClient");
// var obj = params;
// var rtn = null;
// try {
// rtn = await rc.execPushDataPost(obj, url, req.headers["token"], req.headers["request-id"]);
// var returnType = "0";
// if (rtn.stdout) {
// var j = JSON.parse(rtn.stdout);
// if (j && j.status == 0) {
// returnType = "1";
// }
// }
// this.pushlogSve.createDb({
// appid: req.app.id,
// requestId: requestid,
// op: url,
// content: JSON.stringify(obj),
// resultInfo: JSON.stringify(rtn),
// clientIp: req.clientIp,
// returnType: returnType,
// agent: req.uagent,
// opTitle: "数据推送-创建订单",
// });
// } catch (e) {
// this.pushlogSve.createDb({
// appid: req.app.id,
// requestId: requestid,
// op: url,
// content: JSON.stringify(obj),
// resultInfo: JSON.stringify(e.stack),
// clientIp: req.clientIp,
// returnType: '0',
// agent: req.uagent,
// opTitle: "数据推送-创建订单",
// });
// }
// }
// async findAndCountAll(obj, req) {
// var app = req.app;
// if (!app || !app.uAppId) {
// return system.getResult(null, "渠道信息有误");
// }
// obj["search"]["uapp_id"] = app.uAppId;
// const result = await this.dao.findAndCountAll(obj);
// return system.getResultSuccess(result);
// }
// async getOrderDetailByOrderNo(obj, req) {
// var orderNo = obj.orderNo;
// if (!orderNo) {
// return system.getResult(null, "订单编号不能为空");
// }
// var app = req.app;getItemStatusByChannelServiceNo
// if (!app || !app.uAppId) {
// return system.getResult(null, "渠道信息有误");
// }
// var order = await this.dao.model.findOne({
// where: { orderNo: orderNo, uapp_id: app.uAppId },
// attributes: ["orderNo", "channelServiceNo", "channelOrderNo", "channelUserId", "ownerUserId", "needNo",
// "payTime", "quantity", "serviceQuantity", "orderPayStatus", "orderPayStatusName", "totalSum", "payTotalSum",
// "refundSum", "created_at", "opNotes", "notes"
// ],
// raw: true
// });
// if (order && order.orderNo) {
// var orderproducts = await this.orderProductDao.model.findAll({
// where: { sourceOrderNo: order.orderNo },
// attributes: ["sourceOrderNo", "itemCode", "itemName", "channelItemCode", "channelItemName",
// "serviceItemCode", "picUrl", "proPrice", "quantity", "opPayType", "serviceItemSnapshot",
// "created_at"
// ],
// raw: true
// });
// order["orderproducts"] = orderproducts;
// var receptvouchers = await this.orderReceiptVoucherDao.model.findAll({
// where: { sourceOrderNo: order.orderNo },
// attributes: [
// "sourceOrderNo", "accountType", "accountTypeName", "payDate", "totalSum", "payOrderNo", "buyerOpenId",
// "passTradeNo", "buyerAliLogonId", "certifyFileUrl", "wxPayOrderCode", "aliPayOrderCode", "busPayOrderCode",
// "auditStatusName", "auditStatus"
// ],
// raw: true
// });
// order["receptvouchers"] = receptvouchers;
// var refundvouchers = await this.orderRefundVoucherDao.model.findAll({
// where: { sourceOrderNo: order.orderNo },
// attributes: [
// "busPayOrderCode",
// "sourceOrderNo", "accountType", "accountTypeName", "payDate", "totalSum", "payOrderNo", "buyerOpenId",
// "passTradeNo", "certifyFileUrl", "auditStatusName", "auditStatus"
// ],
// raw: true
// });
// order["refundvouchers"] = refundvouchers;
// }
// return system.getResultSuccess(order);
// }
}
module.exports = OrderInfoService;
\ No newline at end of file
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