Skip to content

Z
zhichan
Commit bfdba3c3 by zhaoxiqing
Options

gsb

parent 14642b8e
Showing with 292 additions and 85 deletions
bpo-admin/app/base/api/impl/channelApi.js
...@@ -14,6 +14,7 @@ class ChannelApi { ...@@ -14,6 +14,7 @@ class ChannelApi {
this.FQURL = settings.FQYF().pushOrderApi; this.FQURL = settings.FQYF().pushOrderApi;
this.pushfqlogSve = system.getObject("service.pushfqlogSve") this.pushfqlogSve = system.getObject("service.pushfqlogSve")
this.esettleofflineSve = system.getObject("service.esettleofflineSve") this.esettleofflineSve = system.getObject("service.esettleofflineSve")
this.channelService = system.getObject("service.ChannelSve")
} }
//渠道绑定 //渠道绑定
...@@ -100,6 +101,105 @@ class ChannelApi { ...@@ -100,6 +101,105 @@ class ChannelApi {
} }
//渠道添加
async pushAddChannel(queryobj, qobj, req) {
try {
if(!queryobj.platform_id){
return system.getResultFail(-1, "platform_id不能为空");
}
if(!queryobj.ctype){
return system.getResultFail(-1, "ctype不能为空");
}
if(!queryobj.name){
return system.getResultFail(-1, "name不能为空");
}
if(!queryobj.idcode){
return system.getResultFail(-1, "idcode不能为空");
}
if(queryobj.ctype == 1){
if(!queryobj.business_license){
return system.getResultFail(-1, "business_license不能为空");
}
}else {
if(!queryobj.idcard_front){
return system.getResultFail(-1, "idcard_front不能为空");
}
if(!queryobj.idcard_back){
return system.getResultFail(-1, "idcard_back不能为空");
}
}
if(!queryobj.contact_man){
return system.getResultFail(-1, "contact_man不能为空");
}
if(!queryobj.contact_mobile){
return system.getResultFail(-1, "contact_mobile不能为空");
}
if(!queryobj.contact_email){
return system.getResultFail(-1, "contact_email不能为空");
}
if(!queryobj.contact_addr){
return system.getResultFail(-1, "contact_addr不能为空");
}
var da = await this.channelService.channelSave(queryobj)
if (da.data) {
var bind = {
platform_id: queryobj.platform_id,
channel_id: da.data.id,
platform_channel_id:10000
}
var result = this.channelSve.bindPlatform(bind);
console.log(result);
}
return da;
} catch (e) {
console.log(e);
return system.getResultFail(500, "接口错误");
}
}
//商户添加
async pushAddMerchant(queryobj, qobj, req){
try {
if(!queryobj.channel_id){
return system.getResultFail(-1, "channel_id不能为空");
}
if(!queryobj.origin_id){
return system.getResultFail(-1, "origin_id不能为空");
}
if(!queryobj.merchant_name){
return system.getResultFail(-1, "merchant_name不能为空");
}
if(!queryobj.contact_man){
return system.getResultFail(-1, "contact_man不能为空");
}
if(!queryobj.contact_mobile){
return system.getResultFail(-1, "contact_mobile不能为空");
}
if(!queryobj.contact_email){
return system.getResultFail(-1, "contact_email不能为空");
}
if(!queryobj.contact_addr){
return system.getResultFail(-1, "contact_addr不能为空");
}
if(queryobj.id){
if(!queryobj.origin_merchant_id){
return system.getResultFail(-1, "origin_merchant_id不能为空");
}
if(!queryobj.origin_merchant_name){
return system.getResultFail(-1, "origin_merchant_name不能为空");
}
}
return await this.channelService.merchantSaves(queryobj);
} catch (e) {
console.log(e);
return system.getResultFail(500, "接口错误");
}
}
async paydayCount(queryobj, qobj, req) { async paydayCount(queryobj, qobj, req) {
var data = await this.separateGet(queryobj); var data = await this.separateGet(queryobj);
console.log(data.dataValues) console.log(data.dataValues)
...@@ -127,8 +227,8 @@ class ChannelApi { ...@@ -127,8 +227,8 @@ class ChannelApi {
"idempotentSourceName": "BPO",// 来源编号，写死：BPO薪必果 "idempotentSourceName": "BPO",// 来源编号，写死：BPO薪必果
"thirdPartyChannelId": chnanel.channel_id.toString(),// 渠道id "thirdPartyChannelId": chnanel.channel_id.toString(),// 渠道id
"thirdPartyCustomerId": chnanel.id.toString(),// 第三方客户id "thirdPartyCustomerId": chnanel.id.toString(),// 第三方客户id
// "productId": "5e6b02cc3290c3000a3a63dc",// 云服产品id (测试环境) "productId": "5e6b02cc3290c3000a3a63dc",// 云服产品id (测试环境)
"productId": "5e6c89d54c52bf000a750bc5",// 云服产品id (生产环境) //"productId": "5e6c89d54c52bf000a750bc5",// 云服产品id (生产环境)
// "allotRatio":"50",// 分润比例(百分比的数字部分（如：50代表50%）) // "allotRatio":"50",// 分润比例(百分比的数字部分（如：50代表50%）)
"orderPrice": da.deduct_amt,// 订单金额 "orderPrice": da.deduct_amt,// 订单金额
...@@ -154,8 +254,8 @@ class ChannelApi { ...@@ -154,8 +254,8 @@ class ChannelApi {
"idempotentSourceName": "BPO",// 来源编号，写死：BPO薪必果 "idempotentSourceName": "BPO",// 来源编号，写死：BPO薪必果
"thirdPartyChannelId": chnanel.channel_id.toString(),// 渠道id "thirdPartyChannelId": chnanel.channel_id.toString(),// 渠道id
"thirdPartyCustomerId": chnanel.id.toString(),// 第三方客户id "thirdPartyCustomerId": chnanel.id.toString(),// 第三方客户id
// "productId": "5e6b02cc3290c3000a3a63dc",// 云服产品id (测试环境) "productId": "5e6b02cc3290c3000a3a63dc",// 云服产品id (测试环境)
"productId": "5e6c89d54c52bf000a750bc5",// 云服产品id (生产环境) // "productId": "5e6c89d54c52bf000a750bc5",// 云服产品id (生产环境)
// "allotRatio":"50",// 分润比例(百分比的数字部分（如：50代表50%）) // "allotRatio":"50",// 分润比例(百分比的数字部分（如：50代表50%）)
"orderPrice": da.amt,// 订单金额 "orderPrice": da.amt,// 订单金额
"productQuantity": "1",// 产品数量 "productQuantity": "1",// 产品数量
......
bpo-admin/app/base/db/impl/yzmerchantsignedDao.js 0 → 100644
const system = require("../../system");
const Dao = require("../dao.base");
class YzmerchantsignedDao extends Dao {
constructor() {
super(Dao.getModelName(YzmerchantsignedDao));
}
async getById(id) {
return await this.model.findOne({where: {id: id}, raw: true});
}
}
module.exports = YzmerchantsignedDao;
bpo-admin/app/base/db/models/yzmerchantsigned.js 0 → 100644
const system = require("../../system");
const settings = require("../../../config/settings");
const uiconfig = system.getUiConfig2(settings.wxconfig.appId);
module.exports = (db, DataTypes) => {
return db.define("yzmerchantsigned", {
companyName: DataTypes.STRING,
appId: DataTypes.STRING,
mchtId: DataTypes.STRING,
mainId: DataTypes.STRING,
secret: DataTypes.STRING,
ecid: DataTypes.INTEGER,
params : DataTypes.TEXT,
entcontract_id: DataTypes.INTEGER,
}, {
paranoid: true, //假的删除
underscored: true,
version: true,
freezeTableName: true,
//freezeTableName: true,
// define the table's name
tableName: 'c_yzmerchant_signed',
validate: {
},
indexes: [
// Create a unique index on email
// {
// unique: true,
// fields: ['email']
// },
//
// // Creates a gin index on data with the jsonb_path_ops operator
// {
// fields: ['data'],
// using: 'gin',
// operator: 'jsonb_path_ops'
// },
//
// // By default index name will be [table]_[fields]
// // Creates a multi column partial index
// {
// name: 'public_by_author',
// fields: ['author', 'status'],
// where: {
// status: 'public'
// }
// },
//
// // A BTREE index with a ordered field
// {
// name: 'title_index',
// method: 'BTREE',
// fields: ['author', {attribute: 'title', collate: 'en_US', order: 'DESC', length: 5}]
// }
]
});
}
bpo-admin/app/base/service/impl/channelSve.js
...@@ -53,6 +53,9 @@ class ChannelService extends microService { ...@@ -53,6 +53,9 @@ class ChannelService extends microService {
async merchantSave(params) { async merchantSave(params) {
return await this.callms("channel", "merchantSave", params); return await this.callms("channel", "merchantSave", params);
} }
async merchantSaves(params) {//峰擎推送添加
return await this.callms("channel", "merchantSaves", params);
}
async merchantPage(params) { async merchantPage(params) {
return await this.callms("channel", "merchantPage", params); return await this.callms("channel", "merchantPage", params);
} }
......
bpo-admin/app/base/service/impl/entcontractSve.js
...@@ -21,12 +21,14 @@ class EntcontractService extends ServiceBase { ...@@ -21,12 +21,14 @@ class EntcontractService extends ServiceBase {
this.ecompanybusiDao = system.getObject("db.ecompanybusiDao"); this.ecompanybusiDao = system.getObject("db.ecompanybusiDao");
this.userDao = system.getObject("db.userDao"); this.userDao = system.getObject("db.userDao");
this.esealSve = system.getObject("service.esealSve"); this.esealSve = system.getObject("service.esealSve");
this.enttemplateSve = system.getObject("service.enttemplateSve");
this.entcompanyDao = system.getObject("db.entcompanyDao")
this.ejobapplySve = system.getObject("service.ejobapplySve"); this.ejobapplySve = system.getObject("service.ejobapplySve");
this.restClient = system.getObject("util.restClient"); this.restClient = system.getObject("util.restClient");
this.maindict = system.getObject("util.maindict"); this.maindict = system.getObject("util.maindict");
this.yzmerchantsignedSve = system.getObject("service.yzmerchantsignedSve");
this.eSignBaoRedirectBossUrl = settings.apiconfig.eSignBaoRedirectBossUrl(); this.eSignBaoRedirectBossUrl = settings.apiconfig.eSignBaoRedirectBossUrl();
} }
...@@ -932,7 +934,7 @@ class EntcontractService extends ServiceBase { ...@@ -932,7 +934,7 @@ class EntcontractService extends ServiceBase {
async yzMerchantReSign(params) { async yzMerchantReSign(params) {
let id = params.id; let id = params.id;
let econtract = this.dao.findById(id); let econtract =await this.dao.findById(id);
if (!econtract) { if (!econtract) {
return this.returnjson(-1, "协议不存在"); return this.returnjson(-1, "协议不存在");
} }
...@@ -944,6 +946,11 @@ class EntcontractService extends ServiceBase { ...@@ -944,6 +946,11 @@ class EntcontractService extends ServiceBase {
let enttemplate = await this.enttemplateSve.findById(econtract.enttemplate_id); let enttemplate = await this.enttemplateSve.findById(econtract.enttemplate_id);
// entcompany // entcompany
let entcompany = await this.entcompanyDao.findById(econtract.entcompany_id); let entcompany = await this.entcompanyDao.findById(econtract.entcompany_id);
//c_yzmerchant_signed
var yzparams = await this.yzmerchantsignedSve.findOne({entcontract_id:id})
var yz = JSON.parse(yzparams.params);
// p_user // p_user
let user = await this.userDao.findById(econtract.user_id); let user = await this.userDao.findById(econtract.user_id);
let eaccount = await this.usereaccountDao.findById(econtract.usereaccount_id); let eaccount = await this.usereaccountDao.findById(econtract.usereaccount_id);
...@@ -954,11 +961,11 @@ class EntcontractService extends ServiceBase { ...@@ -954,11 +961,11 @@ class EntcontractService extends ServiceBase {
templateId: enttemplate.templateid, //模板id，由创建模板接口调用返回的templateId 必填 templateId: enttemplate.templateid, //模板id，由创建模板接口调用返回的templateId 必填
name: enttemplate.name, //合同模板名称 必填 name: enttemplate.name, //合同模板名称 必填
simpleFormFields: { simpleFormFields: {
nameA: params.merchantName, //甲方 必填 nameA: yz.merchantName, //甲方 必填
addressA: params.merchantAddr, //甲方地址 addressA: yz.merchantAddr, //甲方地址
representA: params.merchantLegal,//甲方法定代表人 representA: yz.merchantLegal,//甲方法定代表人
agentA: params.idName,//甲方联系人 agentA: yz.idName,//甲方联系人
agentMobileA: params.mobile,//甲方 联系电话 agentMobileA: yz.mobile,//甲方 联系电话
nameB: entcompany.name, //乙方 必填 nameB: entcompany.name, //乙方 必填
addressB: entcompany.addr, //乙方 地址 addressB: entcompany.addr, //乙方 地址
...@@ -966,17 +973,13 @@ class EntcontractService extends ServiceBase { ...@@ -966,17 +973,13 @@ class EntcontractService extends ServiceBase {
agentB: entcompany.contactName,//乙方 联系人 agentB: entcompany.contactName,//乙方 联系人
agentMobileB: entcompany.contactMobile,//乙方 联系电话 agentMobileB: entcompany.contactMobile,//乙方 联系电话
// bankNameB: entcompany.bankAccount,//账户名称
// bank: entcompany.bankName,//开户行
// bankNumB: entcompany.bankNo,//账号
signDate: today,//签约时间 signDate: today,//签约时间
signDateA: today, //甲方签约日期 必填 signDateA: today, //甲方签约日期 必填
signDateB: today //乙方签约日期 必填 signDateB: today //乙方签约日期 必填
} }
}; };
var ebaoAccountId = eaccount.eaccountid; //签署人账户id-- 必填 var ebaoAccountId = eaccount.eaccountid; //签署人账户id-- 必填
var thirdOrderNo = "ent_" + entcontract.id; //第三方流水号，通知回调使用---选填 var thirdOrderNo = id; //第三方流水号，通知回调使用---选填
var eBaoRedirectBossUrl = ""; var eBaoRedirectBossUrl = "";
var tt = await this.utilesignbaoSve.userSignContractNoTemplaterEversalSeal(signParams, ebaoAccountId, thirdOrderNo, eBaoRedirectBossUrl, "econtractSve", sealId); var tt = await this.utilesignbaoSve.userSignContractNoTemplaterEversalSeal(signParams, ebaoAccountId, thirdOrderNo, eBaoRedirectBossUrl, "econtractSve", sealId);
console.log(tt, "-============= result ==========================="); console.log(tt, "-============= result ===========================");
......
bpo-admin/app/base/service/impl/yzmerchantsignedSve.js 0 → 100644
const system = require("../../system");
const ServiceBase = require("../sve.base")
class YzmerchantsignedService extends ServiceBase {
constructor() {
super(ServiceBase.getDaoName(YzmerchantsignedService));
}
}
module.exports = YzmerchantsignedService;
bpo-admin/app/base/system.js
...@@ -27,6 +27,14 @@ class System { ...@@ -27,6 +27,14 @@ class System {
return System.objTable[key]; return System.objTable[key];
} }
static getResultFail(status = -1, errmsg = "fail", data = null) {
return {
status: status,
msg: errmsg,
data: data,
};
}
static getResult3(data,req,okmsg="操作成功",errmsg="操作失败"){ static getResult3(data,req,okmsg="操作成功",errmsg="操作失败"){
var total=data.total; var total=data.total;
data=data.hits; data=data.hits;
...@@ -264,7 +272,7 @@ class System { ...@@ -264,7 +272,7 @@ class System {
var domain = "http://39.107.234.14"; var domain = "http://39.107.234.14";
return { return {
// 渠道服务 // 渠道服务
channel: domain + ":3003" + path, channel: domain2 + ":3003" + path,
} }
} else { } else {
// var odomain = "http://123.57.217.203" // var odomain = "http://123.57.217.203"
......
bpo-admin/app/front/vues/pages/entcontractall2/entcontractall2.html
<gsb-pcpage> <gsb-pcpage>
<div style="padding:10px 20px;"> <div style="padding:10px 20px;">
<div style="height: auto; max-width: 1500px;"> <div style="height: auto; max-width: 1500px;">
<el-card style="background-color: #FFFFFF;padding:10px 10px 30px 10px;margin-top: 20px;"> <!-- <el-card style="background-color: #FFFFFF;padding:10px 10px 30px 10px;margin-top: 20px;">-->
<div style="width:100%;line-height: 40px;"> <!-- <div style="width:100%;line-height: 40px;">-->
<div style="float:left;width: auto;"> <!-- <div style="float:left;width: auto;">-->
<span style="color:2F2F2F;font-size: 14px;" >所属企业： </span> <!-- <span style="color:2F2F2F;font-size: 14px;" >所属企业： </span>-->
<el-select <!-- <el-select-->
v-model="selname" <!-- v-model="selname"-->
filterable <!-- filterable-->
remote <!-- remote-->
clearable <!-- clearable-->
reserve-keyword <!-- reserve-keyword-->
style="width:200px;" <!-- style="width:200px;"-->
placeholder="请搜索公司名称" <!-- placeholder="请搜索公司名称"-->
@change="nameChange" <!-- @change="nameChange"-->
:remote-method="getCompanyNames" <!-- :remote-method="getCompanyNames"-->
:loading="nameLoading"> <!-- :loading="nameLoading">-->
<el-option <!-- <el-option-->
v-for="item in nameList" <!-- v-for="item in nameList"-->
:key="item.id" <!-- :key="item.id"-->
:label="item.name" <!-- :label="item.name"-->
:value="item.name"> <!-- :value="item.name">-->
<span style="float: left;width:150px;">{{ item.name }}</span> <!-- <span style="float: left;width:150px;">{{ item.name }}</span>-->
</el-option> <!-- </el-option>-->
</el-select> <!-- </el-select>-->
</div> <!-- </div>-->
<div style="float:left;width: auto;margin-left: 40px;"> <!-- <div style="float:left;width: auto;margin-left: 40px;">-->
<span style="color:2F2F2F;font-size: 14px;" >客户姓名： </span> <!-- <span style="color:2F2F2F;font-size: 14px;" >客户姓名： </span>-->
<el-input v-model="search.accountName" maxlength="50" clearable style="width:160px;height: 36px;" ></el-input> <!-- <el-input v-model="search.accountName" maxlength="50" clearable style="width:160px;height: 36px;" ></el-input>-->
</div> <!-- </div>-->
<div style="float:left;width: auto;margin-left: 40px;"> <!-- <div style="float:left;width: auto;margin-left: 40px;">-->
<span style="color:2F2F2F;font-size: 14px;" >身份证： </span> <!-- <span style="color:2F2F2F;font-size: 14px;" >身份证： </span>-->
<el-input v-model="search.accountIdno" maxlength="50" clearable style="width:160px;height: 36px;" ></el-input> <!-- <el-input v-model="search.accountIdno" maxlength="50" clearable style="width:160px;height: 36px;" ></el-input>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div style="clear:both;height:20px;"></div> <!-- <div style="clear:both;height:20px;"></div>-->
<div style="width:100%;line-height: 40px;"> <!-- <div style="width:100%;line-height: 40px;">-->
<div style="float:left;width: auto;"> <!-- <div style="float:left;width: auto;">-->
<span style="color:2F2F2F;font-size: 14px;" >客户手机： </span> <!-- <span style="color:2F2F2F;font-size: 14px;" >客户手机： </span>-->
<el-input v-model="search.accountMobile" maxlength="50" clearable style="width:200px;height: 36px;" ></el-input> <!-- <el-input v-model="search.accountMobile" maxlength="50" clearable style="width:200px;height: 36px;" ></el-input>-->
</div> <!-- </div>-->
<div style="float:left;width: 400px;margin-left: 40px;"> <!-- <div style="float:left;width: 400px;margin-left: 40px;">-->
<span style="color:2F2F2F;font-size: 14px; float:left;" >签约日期： </span> <!-- <span style="color:2F2F2F;font-size: 14px; float:left;" >签约日期： </span>-->
<el-date-picker <!-- <el-date-picker-->
v-model="search.signBegin" <!-- v-model="search.signBegin"-->
type="date" <!-- type="date"-->
placeholder="开始时间" <!-- placeholder="开始时间"-->
style="width:140px;height: 36px;float:left;" <!-- style="width:140px;height: 36px;float:left;"-->
format="yyyy-MM-dd" <!-- format="yyyy-MM-dd"-->
value-format="yyyy-MM-dd" <!-- value-format="yyyy-MM-dd"-->
default-value=""> <!-- default-value="">-->
</el-date-picker> <!-- </el-date-picker>-->
<el-date-picker <!-- <el-date-picker-->
v-model="search.signEnd" <!-- v-model="search.signEnd"-->
type="date" <!-- type="date"-->
style="width:140px;height: 36px;margin-left: 16px;float:left;" <!-- style="width:140px;height: 36px;margin-left: 16px;float:left;"-->
placeholder="结束时间" <!-- placeholder="结束时间"-->
format="yyyy-MM-dd" <!-- format="yyyy-MM-dd"-->
value-format="yyyy-MM-dd" <!-- value-format="yyyy-MM-dd"-->
default-value=""> <!-- default-value="">-->
</el-date-picker> <!-- </el-date-picker>-->
</div> <!-- </div>-->
<div style="float:left;margin-top:5px;margin-left: 40px;"> <!-- <div style="float:left;margin-top:5px;margin-left: 40px;">-->
<el-button @click="resetSearch" style="float:right;width:68px;height:36px;background-color: #54C4A7;color: #FFFFFF;font-size: 14px;padding-top:10px;" >重置</el-button> <!-- <el-button @click="resetSearch" style="float:right;width:68px;height:36px;background-color: #54C4A7;color: #FFFFFF;font-size: 14px;padding-top:10px;" >重置</el-button>-->
<el-button @click="opSearch" style="float:right;width:68px;height:36px;background-color: #54C4A7;color: #FFFFFF;font-size: 14px;padding-top:10px;margin-right: 10px;" >搜索</el-button> <!-- <el-button @click="opSearch" style="float:right;width:68px;height:36px;background-color: #54C4A7;color: #FFFFFF;font-size: 14px;padding-top:10px;margin-right: 10px;" >搜索</el-button>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</el-card> <!-- </el-card>-->
<el-card style="background-color: #FFFFFF;padding:10px 10px 30px 10px;margin-top: 20px;"> <el-card style="background-color: #FFFFFF;padding:10px 10px 30px 10px;margin-top: 20px;">
<div style="margin-top: -15px;"> <div style="margin-top: -15px;">
<div style="line-height: 36px;padding-bottom: 20px;"> <div style="line-height: 36px;padding-bottom: 20px;">
<span style="float:left;color:#2F2F2F;font-size: 14px;">共{{search.total}}条记录</span> <span style="float:left;color:#2F2F2F;font-size: 14px;">共{{search.total}}条记录</span>
<el-button @click="exportList()" style="float:right;width:100px;height:36px;color: #FFFFFF;font-weight: 400;border-radius: 4px;font-size: 14px;background-color: #59C1A6;padding-top:11px">导出签约</el-button> <!-- <el-button @click="exportList()" style="float:right;width:100px;height:36px;color: #FFFFFF;font-weight: 400;border-radius: 4px;font-size: 14px;background-color: #59C1A6;padding-top:11px">导出签约</el-button>-->
<!-- <el-button @click="autoOpenEdit()" style="float:right;width:120px;height:36px;color: #FFFFFF;font-weight: 400;border-radius: 4px;font-size: 14px;background-color: #59C1A6;padding-top:11px">批量签约</el-button>--> <!-- <el-button @click="autoOpenEdit()" style="float:right;width:120px;height:36px;color: #FFFFFF;font-weight: 400;border-radius: 4px;font-size: 14px;background-color: #59C1A6;padding-top:11px">批量签约</el-button>-->
</div> </div>
......
bpo-admin/app/front/vues/pages/entcontractall2/entcontractall2.js
...@@ -434,7 +434,16 @@ ...@@ -434,7 +434,16 @@
}); });
}, },
toHand(id) { toHand(id) {
alert(id); var self = this;
self.$root.postReq("/web/entcontractCtl/yzReSign", {
id: id
}).then(function (d) {
if (d.status == 0 && d.data) {
window.open(d.data.esignUrl,'_blank');
} else {
self.$message.warning(d.msg || "签署失败");
}
});
}, },
}, },
vname: "gsb-econtractall2" vname: "gsb-econtractall2"
......
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