1

uniCloud-aliyun/cloudfunctions/router/dao/config.js

@@ -3,12 +3,15 @@
 const dbName = {
 	spotCategory: "jjx-spot-category", //商品-分类表
 	spotGoods: "jjx-spot-goods", //商品-现货表
-	contract: "jjx-contract", //商品-现货表
-	userContract: "jjx-user-contract", //商品-现货表
-	enquirySheet: "jjx-enquiry-sheet", //商品-现货表
-	enquiryQuote: "jjx-enquiry-quotre", //商品-现货表
-	enquiryTemplate: "jjx-enquiry-template", //商品-现货表
-	enquiryAttributes: "jjx-enquiry-attributes", //商品-现货表
-	user: "uni-id-users", //商品-现货表
+	contract: "jjx-contract", // 合同
+	userContract: "jjx-user-contract", // 用户合同
+	enquirySheet: "jjx-enquiry-sheet", // 询价单
+	enquiryQuote: "jjx-enquiry-quotre", // 报价单
+	enquiryTemplate: "jjx-enquiry-template", // 询价模板
+	enquiryAttributes: "jjx-enquiry-attributes", // 询价模板属性
+	user: "uni-id-users", //用户
+	seal: "jjx-seal", //印章
+	processSheet: "jjx-process-sheet", //找加工
+	processQuote: "jjx-process-quote", //找加工报价单
 };
 module.exports = dbName;

uniCloud-aliyun/cloudfunctions/router/service/admin/contract/template/sys/delete.js

@@ -12,18 +12,19 @@ module.exports = {
 		let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
 		let { uid } = data;
 		let res = { code : 0, msg : 'ok' };
-    // 业务逻辑开始-----------------------------------------------------------
+		// 业务逻辑开始-----------------------------------------------------------
 		let { _id } = data;
 		if(vk.pubfn.isNull(_id)){
 			return { code : -1, msg : 'id不能为空' };
 		}
 		let dbName = "jjx-contract-template";
 		await vk.baseDao.deleteById({
-			dbName,
+			dbName: dbName,
 			id:_id
 		});
-    // 业务逻辑结束-----------------------------------------------------------
-    return res;
+		
+		// 业务逻辑结束-----------------------------------------------------------
+		return res;
   }
 
 }

uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/extSign.js

@@ -14,7 +14,14 @@ module.exports = {
 		let res = { code: 0, msg: "" };
 		// 业务逻辑开始-----------------------------------------------------------
 		// 获取用户ID
-		const {fadadaCustomerId} = userInfo
+		const {fadadaCustomerId, fadadaSealId} = userInfo
+		
+		// if(!fadadaSealId) {
+		// 	return {
+		// 		code: -1,
+		// 		msg: '请在个人中心上传印章'
+		// 	}
+		// }
 		
 		// 获取合同信息
 		const userContract = await vk.baseDao.selects({

uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/generate.js

@@ -0,0 +1,80 @@
+'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);
+		// 上传合同模板并填充
+		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: contract.sellerSupplement,
+			}),
+		})
+		
+		
+		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
+			}
+		}
+		
+
+
+		// 业务逻辑结束-----------------------------------------------------------
+		return res;
+	}
+}

uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/launch.js

@@ -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, contractId,title,contractFile,otherFile,signEndDate,buyerSignKeyword, sellSignKeyword } = data;
+		let { uid, contractId,title,contractFile,otherFile,signEndDate,buyerSignKeyword, sellerSignKeyword } = data;
 		let res = { code: 0, msg: "" };
 		// 业务逻辑开始-----------------------------------------------------------
 		
@@ -44,7 +44,7 @@ module.exports = {
 					otherFile,
 					contractBase: contractFile,
 					buyerSignKeyword,
-					sellSignKeyword
+					sellerSignKeyword
 				}
 			})
 			

uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/quote/kh/confirmQuote.js

@@ -1,4 +1,6 @@
 'use strict';
+
+const dbName = require('../../../../../dao/config.js')
 module.exports = {
 	/**
 	 * 同意合作
@@ -40,25 +42,62 @@ module.exports = {
 				status: 1
 			}
 		})
-
-		// 获取商品信息
-		const productTitle = quote.productList.map(item => {
-			return item.name
-		}).join("/")
-
-
+		
 		if (!quote) {
 			return {
 				code: -1,
 				msg: '请刷新页面'
 			}
 		}
+		// 获取乙方信息
+		const quoteUser = await vk.baseDao.select({
+			dbName: dbName.user,
+			getMain: true,
+			getOne: true,
+			whereJson: {
+				_id: quote.userId
+			}
+		})
+
+		// 获取商品信息
+		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: '',
+		// 		}),
+		// 	})
+		// }
+
+
+		
 		// 新增合同记录
 		const contractId = await vk.baseDao.add({
 			dbName: 'jjx-contract',
 			dataJson: {
-				fadadaContractId: vk.pubfn.createOrderNo("E", 20),
-				
+				fadadaContractId: fadadaContractId,
 				contractBase: '', // 原始合同
 				contractHistory: [], // 历史合同
 				contractFinal: '', // 归档合同
@@ -71,10 +110,15 @@ module.exports = {
 				productTitle,
 				tradeMethod: quote.tradeMethod,
 				partyCount: 2,
-				signCount: 0
+				signCount: 0,
+				contractType: sheet.contractType,
+				signMethod: sheet.signMethod,
+				sellerSupplement: sheet.sellerSupplement,
 			}
 		})
 		
+		// 上传合同模板
+		
 		//新增 用户与合同的关联记录 
 		await vk.daoCenter.userContractDao.adds([
 			{

uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/sheet/kh/delete.js

@@ -0,0 +1,28 @@
+'use strict';
+const dbName = require('../../../../../dao/config.js')
+module.exports = {
+	/**
+	 * XXXnameXXX
+	 * @url client/enquiry/sheet/kh/delete 前端调用的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: "" };
+		// 业务逻辑开始-----------------------------------------------------------
+		let { _id } = data;
+		if(vk.pubfn.isNull(_id)){
+			return { code : -1, msg : 'id不能为空' };
+		}
+		await vk.baseDao.deleteById({
+			dbName: dbName.enquirySheet,
+			id:_id
+		});
+
+		// 业务逻辑结束-----------------------------------------------------------
+		return res;
+	}
+}

uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/sheet/pub/getList.js

@@ -9,14 +9,30 @@ module.exports = {
 	main: async (event) => {
 		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
 		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid, userId } = data;
+		let { uid, userId,pageIndex,pageSize,keyword,categoryIds,provinceCodes } = data;
 		let res = { code: 0, msg: "" };
 		// 业务逻辑开始-----------------------------------------------------------
 		let dbName = "jjx-enquiry-sheet";
 		
-		res = await vk.baseDao.getTableData({
+		
+		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,
-			data,
+			pageIndex,
+			pageSize,
+			whereJson,
 			foreignDB: [
 				{
 					dbName:"uni-id-users",

uniCloud-aliyun/cloudfunctions/router/service/client/process/quote/kh/add.js

@@ -0,0 +1,75 @@
+'use strict';
+module.exports = {
+	/**
+	 * 新增加工单
+	 * @url client/process/kh/add 前端调用的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,
+			title,
+			address,
+			files,
+			remark,
+			invoice,
+			writeInvoiceTime,
+			nvoiceType,
+			transportDocuments,
+			transportLimit,
+			tradeMethod,
+			payMethod,
+			advancePayRate,
+			otherPayMethod,
+			reputationPayDay,
+			answerTime,
+			earnestMoney,
+			status
+		} = data;
+		let res = {
+			code: 0,
+			msg: "添加成功"
+		};
+		// 业务逻辑开始-----------------------------------------------------------
+		res.id = await vk.baseDao.add({
+			dbName,
+			dataJson:{
+				title,
+				address,
+				files,
+				remark,
+				invoice,
+				writeInvoiceTime,
+				nvoiceType,
+				transportDocuments,
+				otherTransportDocuments,
+				transportLimit,
+				tradeMethod,
+				payMethod,
+				advancePayRate,
+				otherPayMethod,
+				reputationPayDay,
+				answerTime,
+				earnestMoney,
+				status,
+				answerNumber: 0,
+				userId: uid
+			}
+		});
+		// 业务逻辑结束-----------------------------------------------------------
+		return res;
+	}
+}

uniCloud-aliyun/cloudfunctions/router/service/client/process/quote/pub/getList.js

@@ -0,0 +1,22 @@
+'use strict';
+module.exports = {
+	/**
+	 * 获取加工单
+	 * @url client/process/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 } = data;
+		let res = { code: 0, msg: "" };
+		// 业务逻辑开始-----------------------------------------------------------
+
+
+
+
+		// 业务逻辑结束-----------------------------------------------------------
+		return res;
+	}
+}

uniCloud-aliyun/cloudfunctions/router/service/client/process/sheet/kh/add.js

@@ -0,0 +1,23 @@
+'use strict';
+const dbName = require('../../../../../dao/config.js')
+module.exports = {
+	/**
+	 * 新增加工单
+	 * @url client/process/kh/add 前端调用的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: "" };
+		// 业务逻辑开始-----------------------------------------------------------
+
+
+
+
+		// 业务逻辑结束-----------------------------------------------------------
+		return res;
+	}
+}

uniCloud-aliyun/cloudfunctions/router/service/client/process/sheet/pub/getList.js

@@ -0,0 +1,23 @@
+'use strict';
+const dbName = require('../../../../../dao/config.js')
+module.exports = {
+	/**
+	 * 获取加工单
+	 * @url client/process/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 } = data;
+		let res = { code: 0, msg: "" };
+		// 业务逻辑开始-----------------------------------------------------------
+
+
+
+
+		// 业务逻辑结束-----------------------------------------------------------
+		return res;
+	}
+}

uniCloud-aliyun/cloudfunctions/router/service/client/seal/kh/add.js

@@ -0,0 +1,73 @@
+'use strict';
+const dbName = require('../../../../dao/config.js')
+module.exports = {
+	/**
+	 * 添加印章
+	 * @url client/seal/kh/add 前端调用的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, imageBase64, imageUrl, remark, type, enable, } = data;
+		let res = { code: 0, msg: "" };
+		// 业务逻辑开始-----------------------------------------------------------
+		const {fadadaCustomerId}  = userInfo
+		
+		// 上传印章
+		
+		
+		
+		
+		
+		const fadadaRes = await pubFun.fadada('add_signature.api', {
+			customer_id: fadadaCustomerId,
+			signature_img_base64: imageBase64
+		})
+		
+		if(fadadaRes.code != 1 ) {
+			
+			return {
+				code: -1,
+				msg: fadadaRes.msg
+			}
+		}
+		
+		await vk.baseDao.update({
+			dbName: dbName.seal,
+			whereJson: {
+				_id : _.exists(true),
+			},
+			dataJson: {
+				isDefault: false
+			}
+		})
+		
+		const sealId = await vk.baseDao.add({
+			dbName: dbName.seal,
+			dataJson: {
+				imageUrl: imageUrl,
+				remark,
+				type,
+				enable,
+				isDefault: true,
+				fadadaSealId: fadadaRes.data.signature_id,
+				userId: uid
+			}
+		})
+		
+		vk.baseDao.update({
+			dbName: dbName.user,
+			whereJson: {
+				_id: uid
+			},
+			dataJson: {
+				fadadaSealId: fadadaRes.data.signature_id
+			}
+		})
+		res.data = fadadaRes
+		// 业务逻辑结束-----------------------------------------------------------
+		return res;
+	}
+}

uniCloud-aliyun/cloudfunctions/router/service/client/seal/kh/delete.js

@@ -0,0 +1,28 @@
+'use strict';
+const dbName = require('../../../../dao/config.js')
+module.exports = {
+	/**
+	 * 删除印章
+	 * @url client/seal/kh/delete 前端调用的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: "" };
+		// 业务逻辑开始-----------------------------------------------------------
+		await vk.baseDao.delete({
+			dbName: dbName.seal,
+			whereJson: {
+				_id
+			}
+		})
+
+
+
+		// 业务逻辑结束-----------------------------------------------------------
+		return res;
+	}
+}

uniCloud-aliyun/cloudfunctions/router/service/client/seal/kh/getList.js

@@ -0,0 +1,27 @@
+'use strict';
+const dbName = require('../../../../dao/config.js')
+module.exports = {
+	/**
+	 * 获取印章列表
+	 * @url client/seal/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 } = data;
+		let res = { code: 0, msg: "" };
+		// 业务逻辑开始-----------------------------------------------------------
+		res = await vk.baseDao.selects({
+			dbName: dbName.seal,
+			pageIndex,
+			pageSize,
+			whereJson: {
+				userId: uid
+			}
+		})
+		// 业务逻辑结束-----------------------------------------------------------
+		return res;
+	}
+}

uniCloud-aliyun/cloudfunctions/router/service/client/seal/kh/update.js

@@ -0,0 +1,39 @@
+'use strict';
+const dbName = require('../../../../dao/config.js')
+module.exports = {
+	/**
+	 * 更新印章
+	 * @url client/seal/kh/update 前端调用的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, imageUrl, remark, type, enable, isDefault } = data;
+		let res = { code: 0, msg: "" };
+		// 业务逻辑开始-----------------------------------------------------------
+		if(isDefault) {
+			await vk.baseDao.update({
+				dbName: dbName.seal,
+				dataJson: {
+					isDefault: false
+				}
+			})
+		}
+		await vk.baseDao.update({
+			dbName: dbName.seal,
+			whereJson: {
+				_id
+			},
+			dataJson: {
+				image,
+				remark,
+				type,
+				isDefault
+			}
+		})
+		// 业务逻辑结束-----------------------------------------------------------
+		return res;
+	}
+}