Skip to content

Z
zhichan
Commit 2bf188aa by 宋毅
Options

tj

parent 98607d04
Showing with 58 additions and 27 deletions
igirl-channel/app/base/controller/ctl.base.js
...@@ -59,6 +59,18 @@ class CtlBase { ...@@ -59,6 +59,18 @@ class CtlBase {
var rd = await this.service.create(qobj); var rd = await this.service.create(qobj);
return system.getResult(rd, null); return system.getResult(rd, null);
} }
async createLog(queryobj, qobj, req) {
if (req && req.session && req.session.app) {
qobj.app_id = req.session.app.id;
qobj.onlyCode = req.session.user.unionId;
if (req.codepath) {
qobj.codepath = req.codepath;
}
}
var tmpParam = qobj || queryobj;
var rd = await this.service.create(tmpParam);
return system.getResult(rd, null);
}
async update(queryobj, qobj, req) { async update(queryobj, qobj, req) {
if (req && req.session && req.session.user) { if (req && req.session && req.session.user) {
qobj.onlyCode = req.session.user.unionId; qobj.onlyCode = req.session.user.unionId;
......
igirl-channel/app/base/controller/impl/common/oplogCtl.js
...@@ -17,23 +17,23 @@ class OplogCtl extends CtlBase { ...@@ -17,23 +17,23 @@ class OplogCtl extends CtlBase {
} }
async debug(obj) { async debug(obj) {
obj.logLevel = "debug"; obj.logLevel = "debug";
return this.create(obj); return this.createLog(obj);
} }
async info(obj) { async info(obj) {
obj.logLevel = "info"; obj.logLevel = "info";
return this.create(obj); return this.createLog(obj);
} }
async warn(obj) { async warn(obj) {
obj.logLevel = "warn"; obj.logLevel = "warn";
return this.create(obj); return this.createLog(obj);
} }
async error(obj) { async error(obj) {
obj.logLevel = "error"; obj.logLevel = "error";
return this.create(obj); return this.createLog(obj);
} }
async fatal(obj) { async fatal(obj) {
obj.logLevel = "fatal"; obj.logLevel = "fatal";
return this.create(obj); return this.createLog(obj);
} }
/* /*
......
igirl-channel/app/base/db/impl/dborder/receiptvoucherDao.js
...@@ -12,5 +12,20 @@ class ReceiptVoucherDao extends Dao { ...@@ -12,5 +12,20 @@ class ReceiptVoucherDao extends Dao {
raw: true raw: true
}); });
} }
async addReceiptvoucher(orderParams, req, t) {
var param = {
app_id: req.app.id,//
totalSum: orderParams.totalSum || 0,// 订单总额(产品价格×优惠费率×订单件数)
channelServiceNo: orderParams.channelServiceNo,// 渠道服务单号
auditStatus: "tg",
sourceType: "order",
sourceOrderNo: orderParams.orderNo,// 来源订单号
payDate: orderParams.payTime,//
createuser_id: req.user.id,
creator: orderParams.creator || "",
accountType: "other",
};
return this.create(param, t);//创建订单
}
} }
module.exports = ReceiptVoucherDao; module.exports = ReceiptVoucherDao;
igirl-channel/app/base/service/impl/dborder/orderSve.js
...@@ -8,13 +8,14 @@ class OrderService extends ServiceBase { ...@@ -8,13 +8,14 @@ class OrderService extends ServiceBase {
this.logCtl = system.getObject("web.common.oplogCtl"); this.logCtl = system.getObject("web.common.oplogCtl");
this.appproductDao = system.getObject("db.dbapp.appproductDao"); this.appproductDao = system.getObject("db.dbapp.appproductDao");
this.ordertmproductDao = system.getObject("db.dborder.ordertmproductDao"); this.ordertmproductDao = system.getObject("db.dborder.ordertmproductDao");
this.receiptvoucherDao = system.getObject("db.dborder.receiptvoucherDao");
this.execClient = system.getObject("util.execClient"); this.execClient = system.getObject("util.execClient");
} }
async op1688ChannelPushOrder(action_body, pobj, req) { async op1688ChannelPushOrder(action_body, pobj, req) {
try { try {
var reqUrl = "https://inte-mcp.chanjet.com/gsb/getOrder?token=" + action_body.token; var reqUrl = "https://inte-mcp.chanjet.com/gsb/getOrder?token=" + action_body.token;
var rtn = await this.execClient.execGet("", reqUrl); var rtn = await this.execClient.execGet("", reqUrl);
this.logCtl.info({ var logParam = {
appid: req.app.id, appid: req.app.id,
appkey: req.app.uappKey, appkey: req.app.uappKey,
requestId: req.requestId || "", requestId: req.requestId || "",
...@@ -22,7 +23,8 @@ class OrderService extends ServiceBase { ...@@ -22,7 +23,8 @@ class OrderService extends ServiceBase {
content: "请求地址：" + reqUrl, content: "请求地址：" + reqUrl,
clientIp: pobj.clientIp, clientIp: pobj.clientIp,
optitle: "渠道回调信息返回结果：" + rtn.stdout, optitle: "渠道回调信息返回结果：" + rtn.stdout,
}); };
this.logCtl.info(logParam);
var result = JSON.parse(rtn.stdout); var result = JSON.parse(rtn.stdout);
if (result && result.successed && result.successed == true && result.returnValue && result.returnValue.length) { if (result && result.successed && result.successed == true && result.returnValue && result.returnValue.length) {
this.addOrderNeed(action_body, req, result.returnValue); this.addOrderNeed(action_body, req, result.returnValue);
...@@ -54,7 +56,7 @@ class OrderService extends ServiceBase { ...@@ -54,7 +56,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQQ3120025200_01", "orderItemNum": "ZWWW3120025200_01",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -70,7 +72,7 @@ class OrderService extends ServiceBase { ...@@ -70,7 +72,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQQ3120025200_02", "orderItemNum": "ZWWW3120025200_02",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -86,7 +88,7 @@ class OrderService extends ServiceBase { ...@@ -86,7 +88,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQQ3120025200_03", "orderItemNum": "ZWWW3120025200_03",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -102,7 +104,7 @@ class OrderService extends ServiceBase { ...@@ -102,7 +104,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQQ3120025200_04", "orderItemNum": "ZWWW3120025200_04",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -118,7 +120,7 @@ class OrderService extends ServiceBase { ...@@ -118,7 +120,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQQ3120025200_05", "orderItemNum": "ZWWW3120025200_05",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -134,7 +136,7 @@ class OrderService extends ServiceBase { ...@@ -134,7 +136,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQQ3120025200_06", "orderItemNum": "ZWWW3120025200_06",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -150,7 +152,7 @@ class OrderService extends ServiceBase { ...@@ -150,7 +152,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQQ3120025200_07", "orderItemNum": "ZWWW3120025200_07",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -166,7 +168,7 @@ class OrderService extends ServiceBase { ...@@ -166,7 +168,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQQ3120025200_08", "orderItemNum": "ZWWW3120025200_08",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -182,7 +184,7 @@ class OrderService extends ServiceBase { ...@@ -182,7 +184,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQQ3120025200_09", "orderItemNum": "ZWWW3120025200_09",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -198,7 +200,7 @@ class OrderService extends ServiceBase { ...@@ -198,7 +200,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQQ3120025200_10", "orderItemNum": "ZWWW3120025200_10",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -214,7 +216,7 @@ class OrderService extends ServiceBase { ...@@ -214,7 +216,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQQ3120025200_11", "orderItemNum": "ZWWW3120025200_11",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -230,7 +232,7 @@ class OrderService extends ServiceBase { ...@@ -230,7 +232,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQQ3120025200_12", "orderItemNum": "ZWWW3120025200_12",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -246,7 +248,7 @@ class OrderService extends ServiceBase { ...@@ -246,7 +248,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQQ3120025200_13", "orderItemNum": "ZWWW3120025200_13",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -262,7 +264,7 @@ class OrderService extends ServiceBase { ...@@ -262,7 +264,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQQ3120025200_14", "orderItemNum": "ZWWW3120025200_14",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -278,7 +280,7 @@ class OrderService extends ServiceBase { ...@@ -278,7 +280,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQQ3120025200_15", "orderItemNum": "ZWWW3120025200_15",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -294,7 +296,7 @@ class OrderService extends ServiceBase { ...@@ -294,7 +296,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQQ3120025200_16", "orderItemNum": "ZWWW3120025200_16",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -310,7 +312,7 @@ class OrderService extends ServiceBase { ...@@ -310,7 +312,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQQ3120025200_17", "orderItemNum": "ZWWW3120025200_17",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -326,7 +328,7 @@ class OrderService extends ServiceBase { ...@@ -326,7 +328,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQQ3120025200_18", "orderItemNum": "ZWWW3120025200_18",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -342,7 +344,7 @@ class OrderService extends ServiceBase { ...@@ -342,7 +344,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQQ3120025200_19", "orderItemNum": "ZWWW3120025200_19",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -358,7 +360,7 @@ class OrderService extends ServiceBase { ...@@ -358,7 +360,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQQ3120025200_20", "orderItemNum": "ZWWW3120025200_20",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -443,6 +445,8 @@ class OrderService extends ServiceBase { ...@@ -443,6 +445,8 @@ class OrderService extends ServiceBase {
serviceItemSnapshot: JSON.stringify(productItem),//产品快照 serviceItemSnapshot: JSON.stringify(productItem),//产品快照
}; };
var orderItem = await self.dao.create(orderParams, t);//创建订单 var orderItem = await self.dao.create(orderParams, t);//创建订单
var receiptvoucherItem = await self.receiptvoucherDao.addReceiptvoucher(orderParams, req, t);//创建订单支付信息
if (productItem.itemCode == "zzsbzc") { if (productItem.itemCode == "zzsbzc") {
var orderProductObj = { var orderProductObj = {
app_id: req.app.id,// app_id: req.app.id,//
......
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