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

1、修复签约宝问题

Browse Source 
2、其他调整
This commit is contained in:
b2894lxlx
2023-12-05 22:37:53 +08:00
parent b7d83b0dae
commit 1a47dc1b54
19 changed files with 470 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/addSign.js
+3 -6
View File
@@ -16,16 +16,12 @@ module.exports = {
const otherUser = await vk.baseDao.findByWhereJson({
dbName: 'uni-id-users',
whereJson: {
mobile: "1"
mobile: data.phone
}
})
if (JSON.stringify(otherUser) === '{}') return {
code: -1,
msg: '该用户不存在',
data: {
otherUser,
phone: data.phone
}
msg: '该用户不存在'
}
data.transactionId = vk.pubfn.createOrderNo("C", 20)
@@ -48,6 +44,7 @@ module.exports = {
docTitle: data.title,
type: 'sign',
contractBase: data.contractFile,
partyCount: 2
}
}
})
uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/add.js
+50
View File
@@ -0,0 +1,50 @@
'use strict';
module.exports = {
/**
* XXXnameXXX
* @url client/order/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: ""};
// 业务逻辑开始-----------------------------------------------------------
const goods = await vk.baseDao.findById({
dbName: "jjx-goods",
id: data.goodsId
})
// type 0: 商品
// type 1: 自营
const orderId = await vk.baseDao.add({
dbName: "jjx-order",
dataJson: {
orderNo: vk.pubfn.createOrderNo("O", 20),
uid,
orderStatus: 0,
type: data.type,
amount: goods.amount * data.num,
}
})
await vk.baseDao.add({
dbName: "jjx-order-goods",
dataJson: {
orderId: orderId,
goodsId: data.goodsId,
num: data.num,
goodsName: goods.name,
goodsPrice: goods.amount,
goodsCover: goods.cover,
}
})
res.data = orderId
// 业务逻辑结束-----------------------------------------------------------
return res;
}
}
uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/addFromList.js
+63
View File
@@ -0,0 +1,63 @@
'use strict';
module.exports = {
/**
* XXXnameXXX
* @url client/order/kh/addFromList 前端调用的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 amount = 0
for (const item of data.list) {
const goods = await vk.baseDao.findById({
dbName: "jjx-goods",
id: item.goodsId
})
amount += item.num * goods.amount
}
const orderId = await vk.baseDao.adds({
dbName: "jjx-order",
dataJson: {
orderNo: vk.pubfn.createOrderNo("O", 20),
orderStatus: 0,
type: data.type,
uid,
amount
}
})
const list = []
for (const item of data.list) {
const goods = await vk.baseDao.findById({
dbName: "jjx-goods",
id: item.goodsId
})
list.push({
orderId: orderId,
goodsId: item.goodsId,
num: item.num,
goodsName: goods.name,
goodsPrice: goods.amount,
goodsCover: goods.cover
})
}
await vk.baseDao.adds({
dbName: "jjx-order-goods",
dataJson: list
})
res.data = orderId
// 业务逻辑结束-----------------------------------------------------------
return res;
}
}
uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/getInfo.js
+37
View File
@@ -0,0 +1,37 @@
'use strict';
module.exports = {
/**
* XXXnameXXX
* @url client/order/kh/getInfo 前端调用的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.selects({
dbName: "jjx-order",
getOne: true,
getMain: true,
whereJson: {
_id: data.id
},
foreignDB: [
{
dbName: "jjx-order-goods",
localKey: "_id",
foreignKey: "orderId",
as: "goods",
}
]
});
// 业务逻辑结束-----------------------------------------------------------
return res;
}
}
uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/test.js
-23
View File
@@ -1,23 +0,0 @@
'use strict';
module.exports = {
/**
* 此函数名称
* @url client/order/kh/test 前端调用的url参数地址
* data 请求参数
* @params {String} params1 参数1
*/
main: async (event) => {
let { data = {}, userInfo, util, originalParam } = event;
let { customUtil, config, pubFun, vk, db, _ } = util;
let { uid } = data;
let res = { code : 0, msg : '' };
// 业务逻辑开始-----------------------------------------------------------
// 可写与数据库的交互逻辑等等
// 业务逻辑结束-----------------------------------------------------------
return res;
}
}
uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/updateAddress.js
+32
View File
@@ -0,0 +1,32 @@
'use strict';
module.exports = {
/**
* XXXnameXXX
* @url client/order/kh/updateAddress 前端调用的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: "" };
// 业务逻辑开始-----------------------------------------------------------
await vk.baseDao.updateById({
dbName: "jjx-order",
id: data.id,
dataJson: {
address: data.address,
addressDetail: data.addressDetail,
phone: data.phone,
name: data.name
}
});
// 业务逻辑结束-----------------------------------------------------------
return res;
}
}
uniCloud-aliyun/cloudfunctions/router/service/client/user/pub/getCompany.js
+3 -2
View File
@@ -24,9 +24,10 @@ module.exports = {
whereJson['businessCard.mainSpotCategoryIds'] = _.in(data.mainSpotCategoryIds);
}
// 业务逻辑开始-----------------------------------------------------------
res = await vk.baseDao.getTableData({
res = await vk.baseDao.select({
dbName: dbName.user,
whereJson
whereJson,
pageSize: -1
});
console.log('whereJson', whereJson)
// 业务逻辑结束-----------------------------------------------------------