Skip to content

Z
zhichan
Commit c6e5346a by zhaoxiqing
Options

gsb

parents 6aced023 a6d53585
Showing with 13 additions and 151 deletions
bpo-admin/app/base/api/impl/channelApi.js
...@@ -34,7 +34,7 @@ class ChannelApi { ...@@ -34,7 +34,7 @@ class ChannelApi {
queryobj.begin = moment().subtract(1, 'days').format('YYYY-MM-DD 00:00:00'); /*前一天的时间*/ queryobj.begin = moment().subtract(1, 'days').format('YYYY-MM-DD 00:00:00'); /*前一天的时间*/
queryobj.end = moment().subtract(1, 'days').format('YYYY-MM-DD 23:59:59'); /*前一天的时间*/ queryobj.end = moment().subtract(1, 'days').format('YYYY-MM-DD 23:59:59'); /*前一天的时间*/
var result = await this.channelSve.pushbindingchannel(queryobj); var result = await this.channelSve.pushbindingchannel(queryobj);
var data = result.data; var data = result.data || [];
if (data.length > 0) { if (data.length > 0) {
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
if (data[i].channel_id == '10000' && data[i].origin_merchant_id != '') { if (data[i].channel_id == '10000' && data[i].origin_merchant_id != '') {
...@@ -68,9 +68,13 @@ class ChannelApi { ...@@ -68,9 +68,13 @@ class ChannelApi {
var rc = system.getObject("util.aliyunClient"); var rc = system.getObject("util.aliyunClient");
var rtn = null; var rtn = null;
rtn = await rc.post(this.FQURL, pushData); rtn = await rc.post(this.FQURL, pushData);
<<<<<<< HEAD
console.log(pushData) console.log(pushData)
console.log(rtn) console.log(rtn)
var result = JSON.parse(system.decryption(pushData.param)); var result = JSON.parse(system.decryption(pushData.param));
=======
// var result = JSON.parse(pushData.param);
>>>>>>> a6d535858f893769da85d53ab5812eeb279a410f
if (rtn.success == true) { if (rtn.success == true) {
result.contractNo = rtn.data.contractNo; result.contractNo = rtn.data.contractNo;
result.topush = "0"; result.topush = "0";
...@@ -133,8 +137,13 @@ class ChannelApi { ...@@ -133,8 +137,13 @@ class ChannelApi {
"origin_merchant_id": chnanel.origin_merchant_id,//来源商户id "origin_merchant_id": chnanel.origin_merchant_id,//来源商户id
"platform_channel_id": chnanel.platform_id,//对方渠道id "platform_channel_id": chnanel.platform_id,//对方渠道id
}; };
<<<<<<< HEAD
let encry = system.encryption(JSON.stringify(str)); let encry = system.encryption(JSON.stringify(str));
resultData.param = system.encryption(encry); resultData.param = system.encryption(encry);
=======
let encry = System.encryption(JSON.stringify(str));
resultData.param = encodeURIComponent(system.encryption(encry));
>>>>>>> a6d535858f893769da85d53ab5812eeb279a410f
return resultData; return resultData;
} }
...@@ -159,7 +168,7 @@ class ChannelApi { ...@@ -159,7 +168,7 @@ class ChannelApi {
"origin_merchant_id": chnanel.origin_merchant_id,//来源商户id "origin_merchant_id": chnanel.origin_merchant_id,//来源商户id
"platform_channel_id": chnanel.platform_id,//对方渠道id "platform_channel_id": chnanel.platform_id,//对方渠道id
}; };
resultData.param = system.encryption(JSON.stringify(str)); resultData.param = encodeURIComponent(system.encryption(JSON.stringify(str)));
return resultData; return resultData;
} }
......
bpo-admin/app/base/api/impl/channelApi2.js deleted 100644 → 0
var system = require("../../system")
const md5 = require("MD5");
const logCtl = system.getObject("web.oplogCtl");
const moment = require("moment");
class ChannelApi2 {
constructor() {
this.channelSve = system.getObject("service.channelSve");
this.esettleSve = system.getObject("service.esettleSve");
this.restClient = system.getObject("util.restClient");
this.esettleofflineitemSve = system.getObject("service.esettleofflineitemSve");
this.FQURL = "http://yunfuapi-dev.gongsibao.com/crm/order/submit"
this.esettleofflineSve = system.getObject("service.esettleofflineSve");
}
//渠道绑定
async bindPlatform(queryobj, qobj, req) {
if (!this.trim(queryobj.platform_id)) {
return system.getErrResult2("platform_id不能为空")
}
if (!this.trim(queryobj.channel_id)) {
return system.getErrResult2("channel_id不能为空")
}
if (!this.trim(queryobj.platform_channel_id)) {
return system.getErrResult2("platform_channel_id不能为空")
}
var result = await this.channelSve.bindPlatform(queryobj);
return result;
}
//绑定渠道推送
async pushbindingchannel(queryobj, qobj, req) {
queryobj.begin = moment().subtract(1, 'days').format('YYYY-MM-DD 00:00:00'); /*前一天的时间*/
queryobj.end = moment().subtract(1, 'days').format('YYYY-MM-DD 23:59:59'); /*前一天的时间*/
var result = await this.channelSve.pushbindingchannel(queryobj);
var data = result.data;
if (data.length > 0) {
for (let i = 0; i < data.length; i++) {
if (data[i].channel_id == '10000' && data[i].origin_merchant_id != '') {
var busiData = await this.esettleSve.findBybusiId(data[i].origin_merchant_id);
if (busiData.length > 0) {
for (let j = 0; j < busiData.length; j++) {
var pushData = this.getBusiData(busiData[j], data[i]);
var rc = system.getObject("util.aliyunClient");
var rtn = null;
rtn = await rc.post(this.FQURL, pushData);
console.log(pushData)
console.log(rtn)
}
}
} else {
if (data[i].origin_merchant_id != '') {
var esettleoffline = await this.esettleofflineSve.findOne({ "ecompany_id": data[i].origin_merchant_id });
if (esettleoffline != null) {
var pushData = this.getBusiDatas(esettleoffline.dataValues, data[i]);
var rc = system.getObject("util.aliyunClient");
var rtn = null;
rtn = await rc.post(this.FQURL, pushData);
console.log(pushData)
console.log(rtn)
}
}
}
}
}
}
async paydayCount(queryobj, qobj, req) {
var data = await this.separateGet(queryobj);
console.log(data.dataValues)
}
async separateGet(queryobj) {
let encry = system.decryption(queryobj.param);
encry = JSON.parse(encry);
if (encry.channel_id == 10000) {
var busiData = await this.esettleSve.findByIdList(encry.data_id);
return busiData;
}
var esettleoffline = await this.esettleofflineitemSve.find({ "esettleoffline_id": encry.data_id });
return esettleoffline;
}
getBusiData(da, chnanel) {
var resultData = {
"idempotentId": da.out_trade_no,// 业务编号(订单id)
"idempotentSource": "bpo_xbg",// 来源编号，写死：bpo_xbg
"idempotentSourceName": "BPO",// 来源编号，写死：BPO薪必果
"thirdPartyChannelId": "10000",// 渠道id
"thirdPartyCustomerId": da.busi_id,// 第三方客户id
"productId": "5e6b02cc3290c3000a3a63dc",// 云服产品id (测试环境)
"allotRatio": "50",// 分润比例(百分比的数字部分（如：50代表50%）)
"orderPrice": da.deduct_amt,// 订单金额
"productQuantity": "1",// 产品数量
"companyName": chnanel.merchant_name,// 公司名称
"phone": "13722223333"
};
var str = {
"data_id": da.id,// 发薪批次id tbl_order.id 或者 c_esettle_offline.id
"channel_id": chnanel.channel_id,//渠道id
"channel_merchant_id": da.busi_id,//渠道商户id
"origin_merchant_id": chnanel.origin_merchant_id,//来源商户id
"pushplatform_channel_id": chnanel.platform_id,//对方渠道id
};
let encry = System.encryption(JSON.stringify(str));
resultData.param = system.encryption(encry);
return resultData;
}
getBusiDatas(da, chnanel) {
var resultData = {
"idempotentId": da.id,// 业务编号(订单id)
"idempotentSource": "bpo_xbg",// 来源编号，写死：bpo_xbg
"idempotentSourceName": "BPO",// 来源编号，写死：BPO薪必果
"thirdPartyChannelId": "10000",// 渠道id
"thirdPartyCustomerId": da.busi_id,// 第三方客户id
"productId": "5e6b02cc3290c3000a3a63dc",// 云服产品id (测试环境)
"allotRatio": "50",// 分润比例(百分比的数字部分（如：50代表50%）)
"orderPrice": da.amt,// 订单金额
"productQuantity": "1",// 产品数量
"companyName": da.ecompanyName,// 公司名称
"phone": "13722223333"
};
var str = {
"data_id": da.id,// 发薪批次id tbl_order.id 或者 c_esettle_offline.id
"channel_id": chnanel.channel_id,//渠道id
"channel_merchant_id": da.busi_id,//渠道商户id
"origin_merchant_id": chnanel.origin_merchant_id,//来源商户id
"pushplatform_channel_id": chnanel.platform_id,//对方渠道id
};
resultData.param = system.encryption(JSON.stringify(str));
return resultData;
}
trim(o) {
if (!o) {
return "";
}
return o.toString().trim();
}
}
module.exports = ChannelApi2;
bpo-admin/app/base/api/impl/testApi.js
...@@ -15,7 +15,7 @@ class TestApi { ...@@ -15,7 +15,7 @@ class TestApi {
async testaes(obj) { async testaes(obj) {
let str = '{"channel_id": "11111", "platform_channel_id": "1asdqqwdwqdwqdwqddqdwq", "channel_merchant_id": "211111", "origin_merchant_id": "11112312wqdwqdwqwqd", "data_id": "11221321321dwwqwqdwq1"}'; let str = '{"channel_id": "11111", "platform_channel_id": "1asdqqwdwqdwqdwqddqdwq", "channel_merchant_id": "9", "origin_merchant_id": "xxxx", "data_id": "1209403539471060994"}';
console.log(`字符串: ${str}`); console.log(`字符串: ${str}`);
let encry = System.encryption(str); let encry = System.encryption(str);
......
bpo-admin/app/front/entry/public/js/settle/settleinfo.js
...@@ -47,7 +47,7 @@ var app = new Vue({ ...@@ -47,7 +47,7 @@ var app = new Vue({
} else if(cellValue === "02") { } else if(cellValue === "02") {
return "失败"; return "失败";
} else if(cellValue === "03") { } else if(cellValue === "03") {
return "成功"; return "失败且退款";
} else { } else {
return ""; return "";
} }
......
bpo-admin/app/front/entry/settle/settleinfo.ejs
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
<body style="overflow: hidden; margin: 40px 40px;"> <body style="overflow: hidden; margin: 40px 40px;">
<div id="app"> <div id="app">
<div class="appBack"> <div class="appBack">
12312321
<div style="display: flex; justify-content: space-between; font-size: 13px;"> <div style="display: flex; justify-content: space-between; font-size: 13px;">
<label > <label >
<div style="padding: 5px 0px;">创建时间：{{info.createTime}}</div> <div style="padding: 5px 0px;">创建时间：{{info.createTime}}</div>
......
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