1、新增旧货市场

2、新增用户等级

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

@@ -12,14 +12,20 @@ module.exports = {
         let {uid} = data;
         let res = {code: 0, msg: ""};
         // 业务逻辑开始-----------------------------------------------------------
-
-        const goods = await vk.baseDao.findById({
-            dbName: "jjx-goods",
-            id: data.goodsId
-        })
+        let goods
+        if (data.type === 0) {
+            goods = await vk.baseDao.findById({
+                dbName: "jjx-goods",
+                id: data.goodsId
+            })
+        } else {
+            goods = data.goods
+        }
 
         // type 0: 商品
         // type 1: 自营
+        // type 2: 保证金
+        // type 3: 会员升级
         const orderId = await vk.baseDao.add({
             dbName: "jjx-order",
             dataJson: {
@@ -34,7 +40,7 @@ module.exports = {
         await vk.baseDao.add({
             dbName: "jjx-order-goods",
             dataJson: {
-                orderId: orderId,
+                orderId,
                 goodsId: data.goodsId,
                 num: data.num,
                 goodsName: goods.name,

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

@@ -9,17 +9,16 @@ module.exports = {
     main: async (event) => {
         let {data = {}, userInfo, util, filterResponse, originalParam} = event;
         let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
+        let {uid, type, pageIndex, pageSize} = data;
         let res = {code: 0, msg: ""};
         // 业务逻辑开始-----------------------------------------------------------
-
+        const whereJson = {uid}
+        if(!vk.pubfn.isNull(type))  whereJson.type = type
         res = await vk.baseDao.selects({
             dbName: "jjx-order",
-            whereJson: {
-                uid
-            },
-            pageIndex: 1,
-            pageSize: 500,
+            whereJson,
+            pageIndex,
+            pageSize,
             sortArr:[{ "name":"_id", "type":"desc" }],
             foreignDB: [
                 {

uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/resetOrderNo.js

@@ -0,0 +1,28 @@
+'use strict';
+module.exports = {
+	/**
+	 * XXXnameXXX
+	 * @url client/order/kh/resetOrderNo 前端调用的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: {
+                orderNo: vk.pubfn.createOrderNo("O", 20),
+            }
+        });
+
+
+		// 业务逻辑结束-----------------------------------------------------------
+		return res;
+	}
+}