Skip to content

Z
zhichan
Commit 64acf4be by 王昆
Options

Merge branch 'xgg-saas-platform' of gitlab.gongsibao.com:jiangyong/zhichan into xgg-saas-platform

parents 48897c85 cc28bb60
Showing with 85 additions and 138 deletions
xgg-saas-platform/app/base/controller/impl/saas/channelCtl.js
...@@ -4,6 +4,8 @@ class ChannelCtl extends CtlBase { ...@@ -4,6 +4,8 @@ class ChannelCtl extends CtlBase {
constructor() { constructor() {
super(); super();
this.channelSve = system.getObject("service.saas.channelSve"); this.channelSve = system.getObject("service.saas.channelSve");
this.merchantSve = system.getObject("service.saas.merchantSve");
this.orderSve = system.getObject("service.saas.orderSve");
} }
async dics(params, pobj2, req) { async dics(params, pobj2, req) {
...@@ -65,5 +67,49 @@ class ChannelCtl extends CtlBase { ...@@ -65,5 +67,49 @@ class ChannelCtl extends CtlBase {
} }
/**
* fn:当前渠道所有的商户的所有个体户列表
* @param params
* @param pobj2
* @param req
* @returns {Promise<void>}
*/
async businessmenBelongChannel (params, pobj2, req){
if(!params.channel_id){
return system.getResult(null,`登录失效，请重新登陆`)
}
try{
//获取渠道所有的商户
let merchantIdsRes = await this.merchantSve.queryMerchantByChannelId({channel_id: params.channel_id});
console.log(`channerlCtl->businessmenBelongChannel->merchantIdsRes ` + JSON.stringify(merchantIdsRes));
if(merchantIdsRes.status!=0 ){
return system.getResult(null,`系统错误`);
}
let merchantIds = merchantIdsRes.data;
let ids=[],merchantMap={};
if(merchantIds.length==0){
return system.getResult({rows:[],count:0});
}else{
for (let item of merchantIds) {
merchantMap[item.id] = item;
ids.push(item.id);
}
}
params.merchant_ids=ids;
//获取渠道所有的商户的所有个体户
let res = await this.orderSve.saasorderbusinessmenPage(params);
if(res.status!=0){
return system.getResult({rows:[],count:0});
}
for(let element of res.data.rows){
element.merchant = merchantMap[element.merchant_id];
}
return res;
}catch (e) {
console.log(e);
return system.getResult(null, `系统错误`);
}
}
} }
module.exports = ChannelCtl; module.exports = ChannelCtl;
\ No newline at end of file
xgg-saas-platform/app/base/controller/impl/uc/userCtl.js
...@@ -36,15 +36,20 @@ class UserCtl extends CtlBase { ...@@ -36,15 +36,20 @@ class UserCtl extends CtlBase {
return system.getResult(null, `渠道【${loginName}】不存在`); return system.getResult(null, `渠道【${loginName}】不存在`);
} }
channel = channel.data; channel = channel.data;
/**TODO:这个获取当前用户的交付信息 此处需要优化 需要重新定义接口 start*/
loginUser.contact_man = channel.contact_man; loginUser.contact_man = channel.contact_man;
loginUser.contact_mobile = channel.contact_mobile; loginUser.contact_mobile = channel.contact_mobile;
loginUser.contact_email = channel.contact_email; loginUser.contact_email = channel.contact_email;
loginUser.contact_addr = channel.contact_addr; loginUser.contact_addr = channel.contact_addr;
/** TODO END*/
loginUser.channel_name = channel.name;
var loginsid = await this.setLogin(loginUser); var loginsid = await this.setLogin(loginUser);
let rs = { let rs = {
key: loginsid, key: loginsid,
loginname: loginUser.ucname, loginname: loginUser.ucname,
channel_name:channel.name,
menus: await this.getMenu(loginUser) menus: await this.getMenu(loginUser)
}; };
......
xgg-saas-platform/app/base/service/impl/business/businessmenSve.js
...@@ -52,140 +52,6 @@ class BusinessmenService extends ServiceBase { ...@@ -52,140 +52,6 @@ class BusinessmenService extends ServiceBase {
} }
} }
} }
//
// async signPage(params) {
// var rs = await this.callms("order", "businessmenSignPage", params);
// if (rs.status != 0 || !rs.data || !rs.data.rows) {
// return rs;
// }
// this.transField(rs.data.rows);
// return rs;
// }
//
// async deliverPage(params) {
// var rs = await this.callms("order", "businessmenDeliverPage", params);
// if (rs.status != 0 || !rs.data || !rs.data.rows) {
// return rs;
// }
// this.transField(rs.data.rows);
// return rs;
// }
//
// async info(params) {
// var rs = await this.callms("order", "businessmenInfo", params);
// await this.setMerchant([rs.data]);
// this.transField([rs.data]);
// return rs;
// }
//
// async sign(params) {
// return await this.callms("order", "businessmenSign", params);
// }
//
// async nameList(params) {
// return await this.callms("order", "businessmenNameList", params);
// }
//
// async queryBusinessmen(params) {
// var condition = {
// merchantId: this.trim(params.merchant_id || params.merchantId),
// channelOrderNo: this.trim(params.channelOrderNo),
// }
// var rs = await this.callms("order", "businessmenByChannelOrderNo", condition);
// if (rs.status != 0 && !rs.data) {
// return rs;
// }
// var businessmen = rs.data;
// if(!businessmen) {
// return system.getResult(null, "个体户不存在");
// }
// var dto = {};
//
// dto.orderNo = this.trim(businessmen.orderNo);
// dto.channelOrderNo = this.trim(businessmen.channelOrderNo);
// dto.status = this.trim(businessmen.gstatus);
// dto.legalName = this.trim(businessmen.legalName);
// dto.legalMobile = this.trim(businessmen.legalMobile);
// dto.legalIdCard = this.trim(businessmen.legalIdCard);
// dto.name = this.trim(businessmen.name);
// dto.creditCode = this.trim(businessmen.creditCode);
// dto.businessPlace = this.trim(businessmen.businessPlace);
// dto.businessScope = this.trim(businessmen.businessScope);
// dto.regDate = this.trim(businessmen.regDate);
// dto.businessImg = this.trim(businessmen.businessImg);
// dto.gongzhang = this.trim(businessmen.gongzhang);
// dto.caiwuzhang = this.trim(businessmen.caiwuzhang);
// dto.fapiaozhang = this.trim(businessmen.fapiaozhang);
// dto.hetongzhang = this.trim(businessmen.hetongzhang);
// dto.farenzhang = this.trim(businessmen.farenzhang);
// dto.isBank = businessmen.isBank ? 1 : 0;
// dto.bankName = this.trim(businessmen.bankName);
// dto.bankNo = this.trim(businessmen.bankNo);
// dto.bank = this.trim(businessmen.bank);
// dto.bankImg = this.trim(businessmen.bankImg);
// dto.caImg = this.trim(businessmen.caImg);
// dto.taxRegDay = this.trim(businessmen.taxRegDay);
// dto.taxOrg = this.trim(businessmen.taxOrg);
// dto.courierNo = this.trim(businessmen.courierNo);
// dto.courierImg = this.trim(businessmen.courierImg);
// dto.addedValueRate = this.trim(businessmen.addedValueRate);
// dto.supertaxRate = this.trim(businessmen.supertaxRate);
// dto.commonTaxLadder = this.trim(businessmen.commonTaxLadder);
// dto.commonOtherLadder = this.trim(businessmen.commonOtherLadder);
// dto.specialTaxLadder = this.trim(businessmen.specialTaxLadder);
// dto.specialOtherLadder = this.trim(businessmen.specialOtherLadder);
// dto.contractStartData = this.trim(businessmen.contractStartData);
// dto.contractEndData = this.trim(businessmen.contractEndData);
// dto.contract = this.trim(businessmen.contract);
// dto.opNotes = this.trim(businessmen.opNotes);
// dto.taxUpType = this.trim(businessmen.taxUpType);
// dto.costRate = this.trim(businessmen.costRate);
// dto.signNotes = this.trim(businessmen.signNotes);
// dto.invoiceContents = this.trim(businessmen.invoiceContents);
// return system.getResultSuccess(dto);
// }
//
// async putContract(params) {
// var merchantId = params.merchant_id || params.merchantId;
//
// var condition = {
// merchantId: merchantId,
// channelOrderNo: params.channelOrderNo,
// contractStartData: params.contractStartData,
// contractEndData: params.contractEndData,
// contract: params.contract,
// };
// var rs = await this.callms("order", "addBusinessmenContract", condition);
// return rs;
// }
//
// async setMerchant(rows) {
// if (!rows || rows.length == 0) {
// return;
// }
//
// var merchantIds = [];
// for (var row of rows) {
// merchantIds.push(row.merchant_id);
// }
//
// var mmap = await this.callms("merchant", "getMapByIds", {
// ids: merchantIds,
// attrs: "id, name"
// });
// mmap = mmap.data || {};
// for (var row of rows) {
// row.merchant = mmap[row.merchant_id] || {};
// }
// }
} }
module.exports = BusinessmenService; module.exports = BusinessmenService;
// var task=new UserService(); \ No newline at end of file
// task.getUserStatisticGroupByApp().then(function(result){
// console.log((result));
// }).catch(function(e){
// console.log(e);
// });
\ No newline at end of file
xgg-saas-platform/app/base/service/impl/saas/merchantSve.js
...@@ -173,5 +173,24 @@ class MerchantService extends ServiceBase { ...@@ -173,5 +173,24 @@ class MerchantService extends ServiceBase {
return await this.callms("merchant", "updateOrSaveTitleAndAddr", params); return await this.callms("merchant", "updateOrSaveTitleAndAddr", params);
} }
/**
* fn:根据渠道id查找所有的商户ID
* @param params
* @returns {Promise<{msg: string, data, bizmsg: *|string, status: number}|*|undefined>}
*/
async queryMerchantByChannelId(params){
var rs = await this.callms("merchant", "queryMerchantByChannelId", params);
return rs;
}
/**
* fn:查询个体户下的所有个体户
* @param params
* @returns {Promise<void>}
*/
async queryBusinessmenByMerchantId(params){
var rs = await this.callms("merchant", "saasorderbusinessmenPage", params);
return rs;
}
} }
module.exports = MerchantService; module.exports = MerchantService;
\ No newline at end of file
xgg-saas-platform/app/base/service/impl/saas/orderSve.js
...@@ -139,6 +139,14 @@ class OrderService extends ServiceBase { ...@@ -139,6 +139,14 @@ class OrderService extends ServiceBase {
return rs; return rs;
} }
/**
* fn:个体户列表
* @param params
* @returns {Promise<{msg: string, data, bizmsg: *|string, status: number}|any|undefined>}
*/
async saasorderbusinessmenPage(params){
let rs = await this.callms("order", "saasorderbusinessmenPage", params);
return rs;
}
} }
module.exports = OrderService; module.exports = OrderService;
\ No newline at end of file
xgg-saas-platform/app/base/system.js
...@@ -191,7 +191,7 @@ class System { ...@@ -191,7 +191,7 @@ class System {
let dev = "http://39.107.234.14"; let dev = "http://39.107.234.14";
return { return {
// 公共服务 // 公共服务
common: local + ":3102" + path, common: dev + ":3102" + path,
// 商户服务 // 商户服务
merchant: dev + ":3101" + path, merchant: dev + ":3101" + path,
......
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