Skip to content

Z
zhichan
Commit c67f3efe by 赵庆
Options

gsb

parent 949f56c4
Showing with 65 additions and 551 deletions
bpo-web/.idea/.gitignore 0 → 100644
# Default ignored files
/workspace.xml
bpo-web/.idea/bpo-web.iml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
bpo-web/.idea/misc.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
</project>
\ No newline at end of file
bpo-web/.idea/modules.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/bpo-web.iml" filepath="$PROJECT_DIR$/.idea/bpo-web.iml" />
</modules>
</component>
</project>
\ No newline at end of file
bpo-web/.idea/vcs.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
</component>
</project>
\ No newline at end of file
bpo-web/app/base/api/impl/econtractApi.js
......@@ -2,6 +2,7 @@ var system = require("../../system")
const md5 = require("MD5");
const logCtl = system.getObject("web.oplogCtl");
const moment = require("moment");
class EcontractApi {
constructor() {
this.ecompanySve = system.getObject("service.ecompanySve");
......@@ -144,6 +145,7 @@ class EcontractApi {
async transferNotify(obj, req) {
this.econtractSve.testtransfer(obj);
}
async contractcb(obj, req) {
this.econtractSve.updateCallbackStatus(obj);
}
......@@ -701,8 +703,10 @@ class EcontractApi {
idNo: this.trim(pobj.idNo),
bankno: this.trim(pobj.bankno),
nonceStr: this.trim(pobj.nonceStr),
userCode: this.trim(pobj.userCode),//用户code-韵达
branchCode: this.trim(pobj.branchCode),//韵达分公司ID
sign: this.trim(pobj.sign)
}
};
if (!param.ecid) {
return this.returnjson(-1, "请传入薪必果提供的ecid")
......@@ -987,7 +991,8 @@ class EcontractApi {
try {
this.econtractSve.testtransfer(JSON.stringify(obj));
} catch (error) {}
} catch (error) {
}
var regexNumber = /^[0-9]*$/;
var wechatNoticeList = [] //微信通知列表
......@@ -1261,4 +1266,5 @@ class EcontractApi {
}
}
}
module.exports = EcontractApi;
\ No newline at end of file
bpo-web/app/base/api/impl/emechantApi.js deleted 100644 → 0
var system = require("../../system")
const md5 = require("MD5");
const logCtl = system.getObject("web.oplogCtl");
const moment = require("moment");
class EcontractApi {
constructor() {
this.ecompanySve = system.getObject("service.ecompanySve");
this.econtractSve = system.getObject("service.econtractSve");
this.etemplateSve = system.getObject("service.etemplateSve");
this.utilesignbaoSve = system.getObject("service.utilesignbaoSve");
this.ecompanybusiSve = system.getObject("service.ecompanybusiSve");
this.ecompanywxuserSve = system.getObject("service.ecompanywxuserSve");
this.ecompanybpoSve = system.getObject("service.ecompanybpoSve");
this.usereaccountSve = system.getObject("service.usereaccountSve");
this.wxSve = system.getObject("service.wxSve");
this.esettleSve = system.getObject("service.esettleSve");
this.bankthreelogSve = system.getObject("service.bankthreelogSve");
this.bankthreelog2Sve = system.getObject("service.bankthreelog2Sve");
this.restClient = system.getObject("util.restClient");
this.smsS = system.getObject("util.smsClient");
}
async autoSign(pobj) {
// 处理参数
var param = {
ecid: this.trim(pobj.ecid),
appId: this.trim(pobj.appId),
userId: this.trim(pobj.userId),
idName: this.trim(pobj.idName),
mobile: this.trim(pobj.mobile),
idNo: this.trim(pobj.idNo),
bankno: this.trim(pobj.bankno),
nonceStr: this.trim(pobj.nonceStr),
sign: this.trim(pobj.sign)
}
if (!param.ecid) {
return this.returnjson(-1, "请传入薪必果提供的ecid")
}
if (!param.appId) {
return this.returnjson(-1, "请传入薪必果提供的appId")
}
if (!param.userId) {
return this.returnjson(-1, "请提供该用户的userId")
}
if (!param.idName) {
return this.returnjson(-1, "请提供该用户姓名")
}
if (!param.idNo) {
return this.returnjson(-1, "请提供该用户身份证号")
}
if (!param.bankno) {
return this.returnjson(-1, "请提供该用户银行卡号")
}
if (!param.nonceStr) {
return this.returnjson(-1, "请提供随机码")
}
// 查appId关联key
var busi = await this.ecompanybusiSve.findOne({
appId: param.appId
});
if (!busi || !busi.key) {
return this.returnjson(1001003, "配置信息错误，请联系薪必果人员进行配置");
}
// 签名
var signArr = [];
var keys = Object.keys(param).sort();
for (var i = 0; i < keys.length; i++) {
var k = keys[i];
var v = param[k];
if (!k || !v || k == 'sign') {
continue;
}
signArr.push(k + "=" + v);
}
var signStr = signArr.join("&") + "&key=" + busi.key;
var sign = md5(signStr).toUpperCase();
if (param.sign != sign) {
return this.returnjson(1001001, "签名错误");
}
try {
var result = await this.econtractSve.autoSign(param);
return result;
} catch (error) {
console.log(error);
}
}
async merchantAutoSign_yz() {
}
async merchantAutoSign_yd() {
}
async formateTime(inputTime) {
if (!inputTime) {
return '';
}
var date = new Date(inputTime);
var y = date.getFullYear();
var m = date.getMonth() + 1;
m = m < 10 ? ('0' + m) : m;
var d = date.getDate();
d = d < 10 ? ('0' + d) : d;
var h = date.getHours();
h = h < 10 ? ('0' + h) : h;
var minute = date.getMinutes();
var second = date.getSeconds();
minute = minute < 10 ? ('0' + minute) : minute;
second = second < 10 ? ('0' + second) : second;
return y + '' + m + '' + d + '' + h + '' + minute + '' + second;
};
async formateSimpTime() {
var date = new Date();
var y = date.getFullYear();
var m = date.getMonth() + 1;
m = m < 10 ? ('0' + m) : m;
var d = date.getDate();
d = d < 10 ? ('0' + d) : d;
var h = date.getHours();
h = h < 10 ? ('0' + h) : h;
var minute = date.getMinutes();
minute = minute < 10 ? ('0' + minute) : minute;
return y + '年' + m + '月' + d + '日' + ' ' + h + ':' + minute;
};
async getUidStr(len, radix) {
var chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('');
var uuid = [],
i;
radix = radix || chars.length;
if (len) {
for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix];
} else {
var r;
uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
uuid[14] = '4';
for (i = 0; i < 36; i++) {
if (!uuid[i]) {
r = 0 | Math.random() * 16;
uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
}
}
}
return uuid.join('');
}
trim(o) {
if (!o) {
return "";
}
return o.toString().trim();
}
async validateUser(obj, req) {
// 验证合法性
var idName = this.trim(obj.idName);
var idNo = this.trim(obj.idNo);
var accNo = this.trim(obj.accNo);
var nonceStr = obj.nonceStr;
var sign = obj.sign;
if (!idName) {
return {
code: 1002001,
msg: "参数错误, 姓名不存在"
};
}
if (!idNo) {
return {
code: 1002001,
msg: "参数错误, 身份证不存在"
};
}
if (!accNo) {
return {
code: 1002001,
msg: "参数错误, 银行卡号不存在"
};
}
var sign = md5("accNo=" + accNo + "&idName=" + idName + "&idNo=" + idNo + "&nonceStr=" + obj.nonceStr + "&key=wxf616c0a459d66081").toUpperCase();
if (sign != obj.sign) {
return {
code: 1001001,
msg: "签名失败"
};
}
try {
var list = await this.econtractSve.findSinedByThree(idName, idNo, accNo);
if (list.length > 0) {
return {
code: 0,
msg: "success"
};
}
var nonceStr = obj.nonceStr;
var bankthreeParams = {
name: idName, //姓名 必填
idno: idNo, //身份证 必填
cardno: accNo //银行卡 必填
};
var tt = await this.utilesignbaoSve.bankthree(bankthreeParams, "bankinfoAuth") || {};
// {"code":-110,"message":"手机号格式错误","data":{}}
//1成功,-110提示验证信息有误，-120亲，提供的信息不正确，请验证后再试！
console.log("tt-----------------------------", tt);
if (tt.code == 1) {
return {
code: 0,
msg: "success"
};
} else if (tt.code == -110) {
return {
code: 1002002,
msg: tt.message
};
} else {
return {
code: 1002002,
msg: "银行三要素验证失败"
};
}
} catch (e) {
var result = {
code: 500,
msg: "接口异常"
};
console.log(e.stack);
//日志记录
logCtl.error({
optitle: "校验是否签约error",
op: "api/econtractApi/validContract",
content: e.stack,
clientIp: req.clientIp
});
return result;
}
}
//发薪完，通知消息
async notifyMssage(obj, req) {
var resultNotify = {
code: 1,
message: "success"
};
try {
this.econtractSve.testtransfer(JSON.stringify(obj));
} catch (error) {}
var regexNumber = /^[0-9]*$/;
var wechatNoticeList = [] //微信通知列表
var notifyTime = await this.formateSimpTime();
var errorItems = [];
//循环参数
for (var item in obj.sendList) {
var rowItem = Number(item) + 1;
var orderItemId = obj.sendList[item]['orderItemId'] || "";
var orderItem = await this.esettleSve.findOrderItemById(orderItemId);
if (!orderItem) {
errorItems.push("orderItem" + orderItem + "不存在");
continue;
}
if (orderItem.busi_id = '1152195411663171585') {
continue;
}
var idNo = orderItem.id_no || "";
var amt = orderItem.amt || 0;
var mobile = orderItem.mobile || "";
notifyTime = moment(orderItem.pay_complete_time).add(-8, "hours").format("YYYY年MM月DD日 HH:mm");
var notifyTimeStr = moment(orderItem.pay_complete_time).add(-8, "hours").format("YYYY-MM-DD HH:mm:ss");
//添加支付记录
var incomeTax = parseFloat((Number(orderItem.income_tax) / 100).toFixed(2));
var notifyUrl = "https://bpohhr.gongsibao.com/paynotify?id=" + orderItemId;
var notifyObj = {
fromid: mobile,
username: orderItem.id_name || "",
flag: 0,
amount: amt,
status: 0,
notifyTime: notifyTimeStr,
orderItemId: orderItemId,
income_tax: orderItem.income_tax
}
//为空验证
if (!idNo) {
errorItems.push("第" + rowItem + "项-参数错误, 身份证为空");
continue;
}
if (!amt) {
errorItems.push("第" + rowItem + "项-参数错误, 实发金额为空");
continue;
}
amt = parseFloat((Number(amt) / 100).toFixed(2));
var message = notifyTime + " 您收到报酬费" + amt + "元, 查看详细内容" + notifyUrl;
try {
var list = await this.econtractSve.findOpenIdByNo("2", idNo);
if (list.length > 0) {
var sendItem;
var sendMobile;
for (var item of list) {
if (item.openId.indexOf('oEl') === 0) {
sendItem = item;
break;
}
if (item.mobile) {
sendMobile = item.mobile;
// 手机号通知
notifyObj.username = item.userName;
notifyObj.fromid = mobile || sendMobile;
}
}
if (sendItem) {
// 微信消息模板通知
var wechatParam = {
url: notifyUrl,
first: "您有一个报酬发放通知！",
keyword1: sendItem.userName,
keyword2: "已发放",
keyword3: amt + "元",
keyword4: notifyTime + ' 您的报酬已到帐，请查收！',
openid: sendItem.openId
}
wechatNoticeList.push(wechatParam);
// 通知参数
notifyObj.username = item.userName;
notifyObj.fromid = sendItem.openId;
notifyObj.flag = 1;
await this.econtractSve.addPayNotify(notifyObj);
} else if (mobile || sendMobile) {
// 手机号码通知
// await this.smsS.sendMsg(mobile || sendMobile, message);
await this.econtractSve.addPayNotify(notifyObj);
}
} else {
if (mobile) {
// await this.smsS.sendMsg(mobile, message);
await this.econtractSve.addPayNotify(notifyObj);
} else {
errorItems.push("第" + rowItem + "项-根据身份证获取数据为空");
}
continue;
}
} catch (e) {
resultNotify.code = 500;
resultNotify.message = "接口异常";
//日志记录
logCtl.error({
optitle: "发薪通知error",
op: "api/econtractApi/notifyMssage",
content: e.stack,
clientIp: req.clientIp
});
}
}
if (wechatNoticeList.length > 0) {
await this.wxPushMssage(wechatNoticeList);
}
if (errorItems.length > 0) {
var errors = "";
for (var item of errorItems) {
errors += item + "、";
}
return system.getErrResult2(errors.substr(0, errors.length - 1));
}
return resultNotify;
}
//微信通知消息
async wxPushMssage(wechatNoticeList) {
try {
//微信处理
var data = null;
//添加支付记录
var wxParam = null;
for (var i = 0; i < wechatNoticeList.length; i++) {
var wechatItem = wechatNoticeList[i];
//发送通知
data = {
first: wechatItem.first,
keyword1: {
value: wechatItem.keyword1
},
keyword2: {
value: wechatItem.keyword2
},
keyword3: {
value: wechatItem.keyword3
},
keyword4: {
value: wechatItem.keyword4
}
};
this.wxSve.sendTmplMsg(wechatItem.openid, "khPLingFFTVQM2t7SVm1q1o9MvS2WgqUvIjCPkLcqAY", wechatItem.url || "", data, "wxf616c0a459d66081");
}
} catch (e) {
var result = {
code: 500,
msg: "接口异常"
};
console.log(e.stack);
//日志记录
logCtl.error({
optitle: "微信发薪通知error",
op: "api/econtractApi/wxPushMssage",
content: e.stack,
clientIp: req.clientIp
});
}
return result;
}
async checkSign(obj, req) {
// 验证合法性
var mtchId = obj.mtchId;
var userList = obj.userList;
try {
if (!mtchId) {
return {
code: 1,
msg: "请传入商户id信息"
};
}
if (!userList || userList.length == 0) {
return {
code: 1,
msg: "请传入用户身份信息"
};
}
// 1 处理用户姓名和身份证参数
var idNoList = [];
var idNameList = [];
for (var u of userList) {
idNoList.push(u.idNo);
idNameList.push(u.idName);
}
// 2 查公司
var companybpo = await this.ecompanybpoSve.findOne({
mtchId: mtchId
});
if (!companybpo) {
return {
code: 1,
msg: "电子签企业未录入当前商户ID"
};
}
if (!companybpo.mainId) {
return {
code: 1,
msg: "请更新电子签企业"
};
}
// 3 查签约模板
var templateIds = await this.etemplateSve.findIdsByCompanyIdAndMainId(companybpo.ecompany_id, companybpo.mainId);
if (!templateIds || templateIds.length == 0) {
return {
code: 1,
msg: "电子签模板签约主体设置错误，请到bpo后台重新设置"
};
}
var signList = [];
var unSignList = [];
// 4 查签约用户
var accounts = await this.usereaccountSve.getSignAccounts(templateIds, idNoList, idNameList);
var accountMap = {};
for (var signer of accounts) {
accountMap[signer.userName + "_" + signer.personsSign] = 1;
}
// 5 比对用户是否签约
for (var u of userList) {
if (accountMap[u.idName + "_" + u.idNo]) {
signList.push(u);
} else {
unSignList.push(u);
}
}
return {
code: 0,
msg: "",
data: {
signList: signList,
unSignList: unSignList
}
};
} catch (error) {
var result = {
code: 1,
msg: "接口异常"
};
console.log(e.stack);
//日志记录
logCtl.error({
optitle: "校验签约error",
op: "api/econtractApi/checkSign",
content: e.stack,
clientIp: req.clientIp
});
return result;
}
}
}
module.exports = EcontractApi;
\ No newline at end of file
bpo-web/app/base/service/impl/econtractSve.js
......@@ -281,13 +281,15 @@ class EcontractService extends ServiceBase {
for (var item of errorItems) {
errors += item + "、";
}
return system.getErrResult2(errors.substr(0, errors.length - 1));
}
return resultAll;
}
async getCount(params){
async getCount(params) {
var where = {};
if (params.ecompanyIds) {
where.ecompany_id = {
......@@ -317,7 +319,8 @@ class EcontractService extends ServiceBase {
if (params.eflowstatusList) {
where.eflowstatus = {
[this.db.Op.in]: params.eflowstatusList
};;
};
;
}
if (params.accountName || params.accountMobile || params.accountIdno) {
......@@ -344,7 +347,7 @@ class EcontractService extends ServiceBase {
["id", 'desc']
];
var attributes = [`id`, `fileurl`,`etemplate_id`, `eflowstatus`, `eflowstatusname`, `completed_at`, `end_at`, `user_id`, `usereaccount_id`, `ecompany_id`];
var attributes = [`id`, `fileurl`, `etemplate_id`, `eflowstatus`, `eflowstatusname`, `completed_at`, `end_at`, `user_id`, `usereaccount_id`, `ecompany_id`];
var page = await this.getPageList(currentPage, pageSize, where, orderby, attributes);
if (page && page.rows) {
......@@ -521,16 +524,19 @@ class EcontractService extends ServiceBase {
// }
try {
this.updateApply(contract.id);
} catch (error) {}
} catch (error) {
}
try {
this.syncContract(contract.id);
} catch (error) {}
} catch (error) {
}
try {
// 推送签约信息给客户
this.syncSign(contract.id);
} catch (error) {}
} catch (error) {
}
}
} catch (e) {
logCtl.error({
......@@ -696,6 +702,7 @@ class EcontractService extends ServiceBase {
});
}
}
async pushContract() {
var comsql = "SELECT id, `name`,`encryptkey`, `posturl` FROM `c_ecompany` WHERE posturl <> '' AND posturl IS NOT NULL AND encryptkey IS NOT NULL AND isEnabled = 1";
var companyList = await this.customQuery(comsql);
......@@ -1185,6 +1192,7 @@ class EcontractService extends ServiceBase {
});
return list || [];
}
// 根据身份证Id,获取openId status-2 签约成功
async findOpenIdByNo(status, idNo) {
if (!idNo) {
......@@ -1231,6 +1239,8 @@ class EcontractService extends ServiceBase {
appkey: params.appId,
unionId: unionId,
userId3rd: params.userId,
userCode3rd: params.userCode,
branchCode3rd: params.branchCode,
userName: params.idName,
mobile: params.mobile,
utype: 0,
......@@ -1330,7 +1340,7 @@ class EcontractService extends ServiceBase {
etemplate_id: etemplate.id,
ecompany_id: ecompany.id,
// end_at: end,
}
};
econtract = await this.create(econtract);
// 创建印章id
......@@ -1368,7 +1378,7 @@ class EcontractService extends ServiceBase {
signDateA: today, //甲方签约日期 必填
signDateB: today //乙方签约日期 必填
}
}
};
var ebaoAccountId = eaccount.eaccountid; //签署人账户id-- 必填
var thirdOrderNo = econtract.id; //第三方流水号，通知回调使用---选填
var eBaoRedirectBossUrl = "";
......@@ -1388,6 +1398,7 @@ class EcontractService extends ServiceBase {
econtract.end_at = end_at;
await econtract.save();
this.syncSign(econtract.id);
return this.returnjson(0, "success", {
contractId: econtract.id
});
......@@ -1395,6 +1406,7 @@ class EcontractService extends ServiceBase {
return this.returnjson(-1, tt.message || "签约失败", tt.code);
}
/**
* 静默签
* @param {ecid, appId, userId, idName, mobile, idNo, bankno, nonceStr, sign} params
......@@ -1587,4 +1599,5 @@ class EcontractService extends ServiceBase {
}
}
}
module.exports = EcontractService;
\ 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