b2894lxlx/jjx-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、新增黄页

Browse Source 
2、新增学堂
3、其他调整、修改
This commit is contained in:
b2894lxlx
2023-12-04 01:32:33 +08:00
parent 78f89f2673
commit 16ebffc27e
50 changed files with 2724 additions and 1325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/changeStatus.js
+2 -1
View File
@@ -12,7 +12,7 @@ module.exports = {
let { uid } = data;
let res = { code: 0, msg: "" };
// 业务逻辑开始-----------------------------------------------------------
const {id, authStatus} = data
const {id, authStatus, refuseReason} = data
const fadadaConfirm = authStatus === 1
await vk.baseDao.updateById({
dbName: 'uni-id-users',
@@ -20,6 +20,7 @@ module.exports = {
dataJson: {
authStatus,
fadadaConfirm,
refuseReason,
authTime: Date.now()
}
})
uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/add.js
+24 -6
View File
@@ -12,34 +12,52 @@ module.exports = {
let {uid} = data;
let res = {code: 0, msg: ""};
// 业务逻辑开始-----------------------------------------------------------
data.transactionId = vk.pubfn.createOrderNo("C", 20)
const contractId = await vk.baseDao.add({
dbName: 'jjx-contract',
dataJson: {
...data, ...{
status: 0,
userId: uid
userId: uid,
changeNum: 0
}
}
})
await vk.daoCenter.userContractDao.adds([
{
transactionId: data.transactionId,
transactionId: vk.pubfn.createOrderNo("P", 20),
userId: uid,
role: 'buyer',
sign: false,
contractId
contractId,
},
{
transactionId: data.transactionId,
transactionId: vk.pubfn.createOrderNo("P", 20),
userId: data.seller,
role: 'seller',
sign: false,
contractId
contractId,
}
])
if (data.type === 'process') {
await vk.baseDao.updateById({
dbName: 'jjx-process-sheet',
id: data.sheetId,
dataJson: {
status: 1
}
})
await vk.baseDao.updateById({
dbName: 'jjx-process-quote',
id: data.quoteId,
dataJson: {
status: 1
}
})
}
// 业务逻辑结束-----------------------------------------------------------
return res;
uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/extSign.js
+8 -1
View File
@@ -22,6 +22,13 @@ module.exports = {
// msg: '请在个人中心上传印章'
// }
// }
const contract = await vk.baseDao.findByWhereJson({
dbName: dbName.contract,
whereJson: {
_id: contractId,
}
})
// 获取合同信息
const userContract = await vk.baseDao.selects({
@@ -54,7 +61,7 @@ module.exports = {
const fadadaUrl = await pubFun.fadadaUrl('extsign.api', {
transaction_id: userContract.transactionId,
contract_id: userContract.contract.fadadaContractId,
contract_id: contract.transactionId,
customer_id: fadadaCustomerId,
doc_title: userContract.contract.docTitle,
sign_keyword: sign_keyword,
uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/getList.js
+54 -53
View File
@@ -1,58 +1,59 @@
'use strict';
const dbName = require('../../../../dao/config.js')
module.exports = {
/**
* 获取我的合同列表
* @url client/enquiry/contract/kh/getList 前端调用的url参数地址
* data 请求参数
* @param {String} params1 参数1
*/
main: async (event) => {
let { data = {}, userInfo, util, filterResponse, originalParam } = event;
let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
let { uid, pageIndex, pageSize, tradeMethod, status } = data;
let res = { code: 0, msg: "" };
// 业务逻辑开始-----------------------------------------------------------
const lastWhereJson = {}
const whereJson = {
userId: uid
}
if(tradeMethod != null) {
lastWhereJson['contract.tradeMethod'] = tradeMethod
}
if(status != null) {
lastWhereJson['contract.status'] = status
}
/**
* 获取我的合同列表
* @url client/enquiry/contract/kh/getList 前端调用的url参数地址
* data 请求参数
* @param {String} params1 参数1
*/
main: async (event) => {
let {data = {}, userInfo, util, filterResponse, originalParam} = event;
let {customUtil, uniID, config, pubFun, vk, db, _} = util;
let {uid, pageIndex, pageSize, tradeMethod, status} = data;
let res = {code: 0, msg: ""};
// 业务逻辑开始-----------------------------------------------------------
res = await vk.daoCenter.userContractDao.selects({
data: {
pageIndex,
pageSize
},
whereJson: whereJson,
foreignDB:[
{
dbName: dbName.contract,
localKey:"contractId", // 主表外键字段名
foreignKey: "_id", // 副表外键字段名
as: "contract",
limit: 1, // 当limit = 1时，以对象形式返回，否则以数组形式返回
foreignDB: [
{
dbName: dbName.userContract,
localKey:"_id", // 主表外键字段名
foreignKey: "contractId", // 副表外键字段名
as: "partyList",
limit: 1000,
}
]
}
],
lastWhereJson: lastWhereJson
})
// 业务逻辑结束-----------------------------------------------------------
return res;
}
const lastWhereJson = {}
const whereJson = {
userId: uid
}
if (tradeMethod != null) {
lastWhereJson['contract.tradeMethod'] = tradeMethod
}
if (status != null) {
lastWhereJson['contract.status'] = status
}
res = await vk.daoCenter.userContractDao.selects({
data: {
pageIndex,
pageSize
},
whereJson: whereJson,
sortArr: [{"name": "_id", "type": "desc"}],
foreignDB: [
{
dbName: dbName.contract,
localKey: "contractId", // 主表外键字段名
foreignKey: "_id", // 副表外键字段名
as: "contract",
limit: 1, // 当limit = 1时，以对象形式返回，否则以数组形式返回
foreignDB: [
{
dbName: dbName.userContract,
localKey: "_id", // 主表外键字段名
foreignKey: "contractId", // 副表外键字段名
as: "partyList",
limit: 1000,
}
]
}
],
lastWhereJson: lastWhereJson
})
// 业务逻辑结束-----------------------------------------------------------
return res;
}
}
uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/launch.js
+67 -58
View File
@@ -1,64 +1,73 @@
'use strict';
const dbName = require('../../../../dao/config.js')
module.exports = {
/**
* 发起/创建合同
* @url client/contract/kh/launch 前端调用的url参数地址
* data 请求参数
* @param {String} params1 参数1
*/
main: async (event) => {
let { data = {}, userInfo, util, filterResponse, originalParam } = event;
let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
let { uid, contractId,title,contractFile,otherFile,signEndDate,buyerSignKeyword, sellerSignKeyword } = data;
let res = { code: 0, msg: "" };
// 业务逻辑开始-----------------------------------------------------------
const contract = await vk.baseDao.findByWhereJson({
dbName: dbName.contract,
whereJson: {
_id: contractId,
userId: uid
}
})
console.log('contract: ',dbName.contract,uid);
const uploaddocs = await pubFun.fadada('uploaddocs.api', {
contract_id: contract.fadadaContractId,
doc_title: title,
doc_url: contractFile,
// file: doc_url,
doc_type: '.pdf'
})
if(uploaddocs.code == 1000) {
await vk.baseDao.update({
dbName: dbName.contract,
whereJson: {
_id: contractId,
userId: uid
},
dataJson: {
status: 1,
docTitle: title,
signEndDate,
otherFile,
contractBase: contractFile,
buyerSignKeyword,
sellerSignKeyword
}
})
res.data = uploaddocs.result
}else {
return {
code: -1,
msg: uploaddocs.msg
}
}
/**
* 发起/创建合同
* @url client/contract/kh/launch 前端调用的url参数地址
* data 请求参数
* @param {String} params1 参数1
*/
main: async (event) => {
let {data = {}, userInfo, util, filterResponse, originalParam} = event;
let {customUtil, uniID, config, pubFun, vk, db, _} = util;
let {uid, contractId, title, contractFile, otherFile, signEndDate, buyerSignKeyword, sellerSignKeyword} = data;
let res = {code: 0, msg: ""};
// 业务逻辑开始-----------------------------------------------------------
const contract = await vk.baseDao.findByWhereJson({
dbName: dbName.contract,
whereJson: {
_id: contractId,
userId: uid
}
})
console.log('contract: ', contract);
const newTransactionId = vk.pubfn.createOrderNo("C", 20)
await vk.baseDao.update({
dbName: dbName.contract,
whereJson: {
_id: contractId
},
dataJson: {
transactionId: newTransactionId,
}
})
const uploaddocs = await pubFun.fadada('uploaddocs.api', {
contract_id: newTransactionId,
doc_title: title,
doc_url: contractFile,
// file: doc_url,
doc_type: '.pdf'
})
if (parseInt(uploaddocs.code) === 1000) {
await vk.baseDao.update({
dbName: dbName.contract,
whereJson: {
_id: contractId,
userId: uid
},
dataJson: {
status: 1,
docTitle: title,
signEndDate,
otherFile,
contractBase: contractFile,
buyerSignKeyword,
sellerSignKeyword
}
})
res.data = uploaddocs.result
} else {
return {
code: -1,
msg: uploaddocs.msg
}
}
// 业务逻辑结束-----------------------------------------------------------
return res;
}
// 业务逻辑结束-----------------------------------------------------------
return res;
}
}
uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/viewContract.js
+1 -4
View File
@@ -23,13 +23,10 @@ module.exports = {
})
const viewRes = pubFun.fadadaUrl('viewContract.api', {
contract_id: contract.fadadaContractId
contract_id: contract.transactionId
})
res.data = viewRes
// 业务逻辑结束-----------------------------------------------------------
return res;
uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/quote/kh/addQuote.js
+2 -2
View File
@@ -19,13 +19,13 @@ module.exports = {
let managerName = ''
let managerMobile = ''
if (accountType == 1) {
if (accountType === 1 && person.personName && person.mobile) {
subjectName = person.personName
subjectMobile = person.mobile
} else {
subjectName = company.companyName
subjectMobile = company.legalMobile
if (manager.mobile && manager.personName) {
if (manager && manager.mobile && manager.personName) {
managerName = manager.personName
managerMobile = manager.mobile
}
uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/quote/kh/confirmQuote.js
+148 -133
View File
@@ -2,144 +2,159 @@
const dbName = require('../../../../../dao/config.js')
module.exports = {
/**
* 同意合作
* @url client/enquiry/quote/kh/confirmQuote 前端调用的url参数地址
* data 请求参数
* @param {String} params1 参数1
*/
main: async (event) => {
let {
data = {}, userInfo, util, filterResponse, originalParam
} = event;
let {
customUtil,
uniID,
config,
pubFun,
vk,
db,
_
} = util;
let {
uid,
quoteId
} = data;
let res = {
code: 0,
msg: ""
};
// 业务逻辑开始-----------------------------------------------------------
/**
* 同意合作
* @url client/enquiry/quote/kh/confirmQuote 前端调用的url参数地址
* data 请求参数
* @param {String} params1 参数1
*/
main: async (event) => {
let {
data = {}, userInfo, util, filterResponse, originalParam
} = event;
let {
customUtil,
uniID,
config,
pubFun,
vk,
db,
_
} = util;
let {
uid,
quoteId
} = data;
let res = {
code: 0,
msg: ""
};
// 业务逻辑开始-----------------------------------------------------------
// 修改报价单状态
const quote = await vk.baseDao.updateAndReturn({
dbName: 'jjx-enquiry-quote',
whereJson: {
_id: quoteId,
status: 0
},
dataJson: {
status: 1
}
})
if (!quote) {
return {
code: -1,
msg: '请刷新页面'
}
}
// 获取乙方信息
const quoteUser = await vk.baseDao.select({
dbName: dbName.user,
getMain: true,
getOne: true,
whereJson: {
_id: quote.userId
}
})
// 修改报价单状态
const quote = await vk.baseDao.updateAndReturn({
dbName: 'jjx-enquiry-quote',
whereJson: {
_id: quoteId,
status: 0
},
dataJson: {
status: 1
}
})
// 获取商品信息
const productTitle = quote.productList.map(item => {
return item.name
}).join("/")
// 获取询价单信息
const sheet = await vk.baseDao.selects({
dbName: dbName.enquirySheet,
whereJson: {_id: quote.sheetId},
getMain: true,
getOne: true
})
const fadadaContractId = vk.pubfn.createOrderNo("E", 20)
// 上传合同模板并填充
// if(sheet.signMethod == 0 && sheet.contractType == 0) {
// pubFun.fadada('generate_contract.api', {
// template_id: '20231120',
// contract_id: fadadaContractId,
// parameter_map: JSON.stringify({
// jiaName: userInfo.accountType == 1?userInfo.person.personName: userInfo.company.companyName,
// jiaDate: '',
// jiaPhone: '',
// yiName: userInfo.accountType == 1?userInfo.person.personName: userInfo.company.companyName,
// yiDate: '',
// yiPhone: '',
// sellerSupplement: '',
// }),
// })
// }
if (!quote) {
return {
code: -1,
msg: '请刷新页面'
}
}
// 获取乙方信息
const quoteUser = await vk.baseDao.select({
dbName: dbName.user,
getMain: true,
getOne: true,
whereJson: {
_id: quote.userId
}
})
// 新增合同记录
const contractId = await vk.baseDao.add({
dbName: 'jjx-contract',
dataJson: {
fadadaContractId: fadadaContractId,
contractBase: '', // 原始合同
contractHistory: [], // 历史合同
contractFinal: '', // 归档合同
status: 0,
userId: uid,
type: 'enquiry',
quoteId: quoteId,
sheetId: quote.sheetId,
productList: quote.productList,
productTitle,
tradeMethod: quote.tradeMethod,
partyCount: 2,
signCount: 0,
contractType: sheet.contractType,
signMethod: sheet.signMethod,
sellerSupplement: sheet.sellerSupplement,
}
})
// 上传合同模板
//新增 用户与合同的关联记录
await vk.daoCenter.userContractDao.adds([
{
transactionId: vk.pubfn.createOrderNo("S", 20),
userId: uid,
role: 'buyer',
sign: false,
contractId
},
{
transactionId: vk.pubfn.createOrderNo("S", 20),
userId: quote.userId,
role: 'seller',
sign: false,
contractId
}
])
// 获取询价单信息
const sheet = await vk.baseDao.selects({
dbName: dbName.enquirySheet,
whereJson: {_id: quote.sheetId},
getMain: true,
getOne: true
})
// 获取商品信息
const productTitle = sheet.productList.map(item => {
return item.goodsName
}).join("/")
const fadadaContractId = vk.pubfn.createOrderNo("E", 20)
// 上传合同模板并填充
// if(sheet.signMethod == 0 && sheet.contractType == 0) {
// pubFun.fadada('generate_contract.api', {
// template_id: '20231120',
// contract_id: fadadaContractId,
// parameter_map: JSON.stringify({
// jiaName: userInfo.accountType == 1?userInfo.person.personName: userInfo.company.companyName,
// jiaDate: '',
// jiaPhone: '',
// yiName: userInfo.accountType == 1?userInfo.person.personName: userInfo.company.companyName,
// yiDate: '',
// yiPhone: '',
// sellerSupplement: '',
// }),
// })
// }
// 新增合同记录
const contractId = await vk.baseDao.add({
dbName: 'jjx-contract',
dataJson: {
fadadaContractId: fadadaContractId,
contractBase: '', // 原始合同
contractHistory: [], // 历史合同
contractFinal: '', // 归档合同
status: 0,
userId: uid,
type: 'enquiry',
quoteId: quoteId,
sheetId: quote.sheetId,
productList: quote.productList,
productTitle,
tradeMethod: quote.tradeMethod,
partyCount: 2,
signCount: 0,
contractType: sheet.contractType,
signMethod: sheet.signMethod,
sellerSupplement: sheet.sellerSupplement,
transactionId: vk.pubfn.createOrderNo("C", 20),
amount: quote.totalPrice,
}
})
// 业务逻辑结束-----------------------------------------------------------
return res;
}
await vk.baseDao.updateById({
dbName: 'jjx-enquiry-sheet',
id: quote.sheetId,
dataJson: {
status: 1
}
})
await vk.baseDao.updateById({
dbName: 'jjx-enquiry-quote',
id: quoteId,
dataJson: {
status: 1
}
})
// 上传合同模板
//新增 用户与合同的关联记录
await vk.daoCenter.userContractDao.adds([
{
transactionId: vk.pubfn.createOrderNo("E", 20),
userId: uid,
role: 'buyer',
sign: false,
contractId
},
{
transactionId: vk.pubfn.createOrderNo("E", 20),
userId: quote.userId,
role: 'seller',
sign: false,
contractId
}
])
// 业务逻辑结束-----------------------------------------------------------
return res;
}
}
uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/sheet/kh/add.js
+2 -1
View File
@@ -22,7 +22,8 @@ module.exports = {
...data,
...{
answerNumber: 0,
userId: uid
userId: uid,
status: 0
}
}
uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/sheet/pub/getList.js
+76 -58
View File
@@ -1,60 +1,78 @@
'use strict';
module.exports = {
/**
* 获取用户发布的询价单
* @url client/enquiry/sheet/pub/getList 前端调用的url参数地址
* data 请求参数
* @param {String} params1 参数1
*/
main: async (event) => {
let { data = {}, userInfo, util, filterResponse, originalParam } = event;
let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
let { uid, userId,pageIndex,pageSize,keyword,categoryIds,provinceCodes } = data;
let res = { code: 0, msg: "" };
// 业务逻辑开始-----------------------------------------------------------
let dbName = "jjx-enquiry-sheet";
let whereJson = {};
if(vk.pubfn.isNotNull(keyword)) {
whereJson.name = new RegExp(keyword)
}
if(vk.pubfn.isNotNull(categoryIds)) {
whereJson.categoryIds = _.in(categoryIds)
}
if(vk.pubfn.isNotNull(provinceCodes)) {
whereJson['address.province.code'] = _.in(provinceCodes)
}
res = await vk.baseDao.selects({
dbName,
pageIndex,
pageSize,
whereJson,
foreignDB: [
{
dbName:"uni-id-users",
localKey:"userId",
foreignKey:"_id",
as:"user",
limit:1, // limit=1则以对象形式返回
fieldJson:{
_id: true,
company: {
companyName: true
},
person: {
personName: true
},
businessCard: true,
accountType: true,
},
},
/**
* 获取用户发布的询价单
* @url client/enquiry/sheet/pub/getList 前端调用的url参数地址
* data 请求参数
* @param {String} params1 参数1
*/
main: async (event) => {
let {data = {}, userInfo, util, filterResponse, originalParam} = event;
let {customUtil, uniID, config, pubFun, vk, db, _} = util;
let {uid, pageIndex, pageSize, keyword, categoryIds, provinceCodes, formData} = data;
let res = {code: 0, msg: ""};
// 业务逻辑开始-----------------------------------------------------------
let dbName = "jjx-enquiry-sheet";
]
});
let whereJson = {};
if (vk.pubfn.isNotNull(keyword)) {
whereJson.name = new RegExp(keyword)
}
if (data.userId && vk.pubfn.isNotNull(data.userId)) {
whereJson.userId = data.userId
}else {
whereJson.status = 0
}
if (formData && formData.hasOwnProperty('userId') && vk.pubfn.isNotNull(formData.userId)) {
whereJson.userId = formData.userId
}else {
whereJson.status = 0
}
if (formData && formData.hasOwnProperty('companyList') && vk.pubfn.isNotNull(formData.companyList)) {
whereJson.userId = _.in(formData.companyList)
}
if (formData && formData.hasOwnProperty('categoryIds') && vk.pubfn.isNotNull(formData.categoryIds)) {
whereJson.categoryIds = _.in(formData.categoryIds)
}
if (vk.pubfn.isNotNull(provinceCodes)) {
whereJson['address.province.code'] = _.in(provinceCodes)
}
res = await vk.baseDao.selects({
dbName,
pageIndex,
pageSize,
whereJson,
sortArr: [{name: "_add_time", type: "desc"}],
foreignDB: [
{
dbName: "uni-id-users",
localKey: "userId",
foreignKey: "_id",
as: "user",
limit: 1, // limit=1则以对象形式返回
fieldJson: {
_id: true,
company: {
companyName: true
},
person: {
personName: true
},
businessCard: true,
accountType: true,
},
},
]
});
const rows = res.rows
rows.forEach((row, rowIndex) => {
@@ -71,13 +89,13 @@ module.exports = {
const index = res.rows.indexOf(item);
res.rows[index].quoteNum = await vk.baseDao.count({
dbName: 'jjx-enquiry-quote',
whereJson:{
whereJson: {
sheetId: item._id
}
})
}
res.rows = rows
// 业务逻辑结束-----------------------------------------------------------
return res;
}
// 业务逻辑结束-----------------------------------------------------------
return res;
}
}
uniCloud-aliyun/cloudfunctions/router/service/client/fadada.js
+14 -3
View File
@@ -74,6 +74,7 @@ var cloudObject = {
config,
pubFun
} = this.getUtil(); // 获取工具包
console.log('fadada res:', data)
const {
customerId
} = data;
@@ -90,7 +91,7 @@ var cloudObject = {
res = await pubFun.fadada('find_personCertInfo.api', {
verified_serialno: user.fadadaVerify.transactionNo
})
console.log('fadada check res:', res)
// 认证结果
const {person} = res.data
if(res.code !== 1 || person.status !== 2) {
@@ -100,7 +101,7 @@ var cloudObject = {
res = await pubFun.fadada('find_companyCertInfo.api', {
verified_serialno: user.fadadaVerify.transactionNo
})
console.log('fadada check res:', res)
// 认证结果
const {company, manager} = res.data
if(res.code !== 1 || company.status !== 4 || manager.status !== 2) {
@@ -179,7 +180,6 @@ var cloudObject = {
whereJson: {
_id: userContract.contractId,
status: 1,
},
dataJson: {
signCount: _.inc(1),
@@ -187,6 +187,17 @@ var cloudObject = {
}
})
// 用户交易额
await vk.baseDao.update({
dbName: "uni-id-users",
whereJson: {
_id: userContract.userId
},
dataJson: {
transactionAmount: _.inc(contract.amount)
}
})
if (contract.signCount == contract.partyCount) {
contract = await vk.daoCenter.contractDao.updateAndReturn({
db: transaction,
uniCloud-aliyun/cloudfunctions/router/service/client/process/sheet/kh/add.js
+2 -1
View File
@@ -19,7 +19,8 @@ module.exports = {
...data,
...{
userId: data.uid,
answerNumber: 0
answerNumber: 0,
status: 0,
}
}
});
uniCloud-aliyun/cloudfunctions/router/service/client/process/sheet/pub/getInfo.js
+9 -7
View File
@@ -23,15 +23,17 @@ module.exports = {
res.quoteList = await vk.baseDao.selects({
dbName: quoteDbName,
sheetId: data.id,
whereJson: {
sheetId: data.id,
},
foreignDB: [
{
dbName:"uni-id-users",
localKey:"userId",
foreignKey:"_id",
as:"user",
limit:1, // limit=1则以对象形式返回
fieldJson:{
dbName: "uni-id-users",
localKey: "userId",
foreignKey: "_id",
as: "user",
limit: 1, // limit=1则以对象形式返回
fieldJson: {
_id: true,
company: {
companyName: true,
uniCloud-aliyun/cloudfunctions/router/service/client/process/sheet/pub/getList.js
+11 -1
View File
@@ -10,7 +10,7 @@ module.exports = {
main: async (event) => {
let {data = {}, userInfo, util, filterResponse, originalParam} = event;
let {customUtil, uniID, config, pubFun, vk, db, _} = util;
let {uid, userId, pageIndex, pageSize, keyword, categoryIds, provinceCodes} = data;
let {uid, userId, pageIndex, pageSize, keyword, categoryIds, provinceCodes, formData} = data;
let res = {code: 0, msg: ""};
// 业务逻辑开始-----------------------------------------------------------
const dbName = "jjx-process-sheet";
@@ -21,6 +21,16 @@ module.exports = {
}
if (vk.pubfn.isNotNull(userId)) {
whereJson.userId = userId
}else {
whereJson.status = 0
}
if (formData && formData.hasOwnProperty('companyList') && vk.pubfn.isNotNull(formData.companyList)) {
whereJson.userId = _.in(formData.companyList)
}
if (formData && formData.hasOwnProperty('categoryIds') && vk.pubfn.isNotNull(formData.categoryIds)) {
whereJson.categoryIds = _.in(formData.categoryIds)
}
if (vk.pubfn.isNotNull(categoryIds)) {
uniCloud-aliyun/cloudfunctions/router/service/client/spot/goods/kh/addUpdate.js
+52 -41
View File
@@ -1,46 +1,57 @@
'use strict';
module.exports = {
/**
* 新增或更新现货
* @url client/product/goods/kh/addUpdate 前端调用的url参数地址
* data 请求参数
* @param {String} params1 参数1
*/
main: async (event) => {
let { data = {}, userInfo, util, filterResponse, originalParam } = event;
let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
let { uid } = data;
let res = { code: 0, msg: "" };
const dbName = 'jjx-spot-goods'
let {_id,name,categoryIds,address,stock,files} = data
// 业务逻辑开始-----------------------------------------------------------
let info = await vk.baseDao.findByWhereJson({
dbName,
whereJson:{
userId: uid,
}
});
if(info == null) {
await vk.baseDao.add({
dbName,
dataJson:{
name,categoryIds,address,stock,files,userId: uid,sort: 0
}
});
}else {
await vk.baseDao.updateById({
dbName,
id: info._id,
dataJson:{
name,categoryIds,address,stock,files
}
});
}
/**
* 新增或更新现货
* @url client/product/goods/kh/addUpdate 前端调用的url参数地址
* data 请求参数
* @param {String} params1 参数1
*/
main: async (event) => {
let {data = {}, userInfo, util, filterResponse, originalParam} = event;
let {customUtil, uniID, config, pubFun, vk, db, _} = util;
let {uid} = data;
let res = {code: 0, msg: ""};
const dbName = 'jjx-spot-goods'
let {_id, name, categoryIds, address, stock, files} = data
// 业务逻辑开始-----------------------------------------------------------
let info = await vk.baseDao.findByWhereJson({
dbName,
whereJson: {
userId: uid,
}
});
if (info == null) {
await vk.baseDao.add({
dbName,
dataJson: {
name,
categoryIds,
address,
stock,
files,
userId: uid,
sort: 0,
status: 0
}
});
} else {
await vk.baseDao.updateById({
dbName,
id: info._id,
dataJson: {
name,
categoryIds,
address,
stock,
files,
status: 0
}
});
}
// 业务逻辑结束-----------------------------------------------------------
return res;
}
// 业务逻辑结束-----------------------------------------------------------
return res;
}
}
uniCloud-aliyun/cloudfunctions/router/service/client/spot/goods/pub/getDetail.js
+87 -69
View File
@@ -1,75 +1,93 @@
'use strict';
const dbName = 'jjx-spot-goods'
module.exports = {
/**
* XXXnameXXX
* @url client/spot/goods/kh/getDetail 前端调用的url参数地址
* data 请求参数
* @param {String} params1 参数1
*/
main: async (event) => {
let {
data = {}, userInfo, util, filterResponse, originalParam
} = event;
let {
customUtil,
uniID,
config,
pubFun,
vk,
db,
_
} = util;
let {
uid
} = data;
let res = {
code: 0,
msg: ""
};
// 业务逻辑开始-----------------------------------------------------------
const {
_id
} = data
res.data = await vk.baseDao.selects({
dbName,
getOne: true,
getMain: true,
// 主表where条件
whereJson: {
_id: _id
},
foreignDB: [{
dbName: "uni-id-users",
localKey: "userId",
foreignKey: "_id",
as: "user",
limit: 1, // limit=1则以对象形式返回
fieldJson: {
_id: true,
company: {
companyName: true
},
person: {
personName: true
},
businessCard: true,
accountType: true,
},
},
{
dbName: "jjx-goods-cooperate",
localKey: "_id",
foreignKey: "goodsId",
as: "cooperateList",
limit: 500, // limit=1则以对象形式返回
}
]
});
/**
* XXXnameXXX
* @url client/spot/goods/kh/getDetail 前端调用的url参数地址
* data 请求参数
* @param {String} params1 参数1
*/
main: async (event) => {
let {
data = {}, userInfo, util, filterResponse, originalParam
} = event;
let {
customUtil,
uniID,
config,
pubFun,
vk,
db,
_
} = util;
let {
uid
} = data;
let res = {
code: 0,
msg: ""
};
// 业务逻辑开始-----------------------------------------------------------
const {
_id
} = data
res.data = await vk.baseDao.selects({
dbName,
getOne: true,
getMain: true,
// 主表where条件
whereJson: {
_id: _id
},
foreignDB: [{
dbName: "uni-id-users",
localKey: "userId",
foreignKey: "_id",
as: "user",
limit: 1, // limit=1则以对象形式返回
fieldJson: {
_id: true,
company: {
companyName: true
},
person: {
personName: true
},
businessCard: true,
accountType: true,
},
},
{
dbName: "jjx-goods-cooperate",
localKey: "_id",
foreignKey: "goodsId",
as: "cooperateList",
limit: 500, // limit=1则以对象形式返回
foreignDB: [{
dbName: "uni-id-users",
localKey: "userId",
foreignKey: "_id",
as: "user",
limit: 1, // limit=1则以对象形式返回
fieldJson: {
_id: true,
company: {
companyName: true
},
person: {
personName: true
},
businessCard: true,
accountType: true,
},
},
]
}
]
});
// 业务逻辑结束-----------------------------------------------------------
return res;
}
// 业务逻辑结束-----------------------------------------------------------
return res;
}
}
uniCloud-aliyun/cloudfunctions/router/service/client/user/pub/getCompany.js
+22 -19
View File
@@ -1,30 +1,33 @@
'use strict';
const dbName = require("../../../../dao/config");
module.exports = {
/**
* 企业用户列表
* @url client/user/pub/getCompany 前端调用的url参数地址
* data 请求参数
* @param {String} params1 参数1
*/
main: async (event) => {
let { data = {}, userInfo, util, filterResponse, originalParam } = event;
let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
let { uid } = data;
let res = { code: 0, msg: "" };
// 业务逻辑开始-----------------------------------------------------------
/**
* 企业用户列表
* @url client/user/pub/getCompany 前端调用的url参数地址
* data 请求参数
* @param {String} params1 参数1
*/
main: async (event) => {
let {data = {}, userInfo, util, filterResponse, originalParam} = event;
let {customUtil, uniID, config, pubFun, vk, db, _} = util;
let {uid} = data;
let res = {code: 0, msg: ""};
// 业务逻辑开始-----------------------------------------------------------
res = await vk.baseDao.getTableData({
dbName: dbName.user,
data,
whereJson:{
fadadaConfirm: true,
accountType: 2
whereJson: {
// fadadaConfirm: true,
...data,
...{
accountType: 2,
businessCard: _.exists(true),
}
}
});
// 业务逻辑结束-----------------------------------------------------------
return res;
}
// 业务逻辑结束-----------------------------------------------------------
return res;
}
}
uniCloud-aliyun/cloudfunctions/router/service/client/user/pub/getDetail.js
+45 -48
View File
@@ -1,53 +1,50 @@
'use strict';
module.exports = {
/**
* 获取企业详情
* @url client/user/pub/getDetail 前端调用的url参数地址
* data 请求参数
* @param {String} params1 参数1
*/
main: async (event) => {
let { data = {}, userInfo, util, filterResponse, originalParam } = event;
let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
let { uid, _id } = data;
let res = { code: 0, msg: "" };
// 业务逻辑开始-----------------------------------------------------------
const dbName = "uni-id-users"
res.data = await vk.baseDao.selects({
dbName,
getOne: true,
getMain: true,
whereJson: {
_id
},
foreignDB: [
{
dbName: 'jjx-spot-goods',
localKey:"_id",
foreignKey:"userId",
as:"goodsList",
},
{
dbName: 'jjx-enquiry-sheet',
localKey:"_id",
foreignKey:"userId",
as:"goodsList",
},
// {
// dbName: 'jjx-enquiry-sheet',
// localKey:"_id",
// foreignKey:"userId",
// as:"goodsList",
// }
]
})
/**
* 获取企业详情
* @url client/user/pub/getDetail 前端调用的url参数地址
* data 请求参数
* @param {String} params1 参数1
*/
main: async (event) => {
let {data = {}, userInfo, util, filterResponse, originalParam} = event;
let {customUtil, uniID, config, pubFun, vk, db, _} = util;
let {uid, _id} = data;
let res = {code: 0, msg: ""};
// 业务逻辑开始-----------------------------------------------------------
const dbName = "uni-id-users"
res.data = await vk.baseDao.selects({
dbName,
getOne: true,
getMain: true,
whereJson: {
_id
},
foreignDB: [
{
dbName: 'jjx-spot-goods',
localKey: "_id",
foreignKey: "userId",
as: "spotList",
},
{
dbName: 'jjx-enquiry-sheet',
localKey: "_id",
foreignKey: "userId",
as: "enquiryList",
},
{
dbName: 'jjx-process-sheet',
localKey: "_id",
foreignKey: "userId",
as: "processList",
}
]
})
// 业务逻辑结束-----------------------------------------------------------
return res;
}
// 业务逻辑结束-----------------------------------------------------------
return res;
}
}
uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginBySms.js
+1
View File
@@ -73,6 +73,7 @@ module.exports = {
company,
accountType: accountType,
nickname: accountType == 1?person.personName: company.companyName,
authStatus: -1
}
});
}else {