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/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;