1、新增旧货市场

2、新增用户等级

uniCloud-aliyun/cloudfunctions/router/service/client/user/kh/exchangeUpgrade.js

@@ -0,0 +1,35 @@
+'use strict';
+module.exports = {
+	/**
+	 * XXXnameXXX
+	 * @url client/user/kh/exchangeUpgrade 前端调用的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 userLevelConfig = await vk.baseDao.findById({
+			dbName: "jjx-user-level",
+            id: data.id
+		});
+
+        if(parseInt(userInfo.userLevel) < userLevelConfig.level) {
+            await vk.baseDao.updateById({
+                dbName: "uni-id-users",
+                id: uid,
+                dataJson: {
+                    userLevel: userLevelConfig.level
+                }
+            });
+        }
+
+
+		// 业务逻辑结束-----------------------------------------------------------
+		return res;
+	}
+}

uniCloud-aliyun/cloudfunctions/router/service/client/user/pub/getCompany.js

@@ -12,22 +12,27 @@ module.exports = {
         let {customUtil, uniID, config, pubFun, vk, db, _} = util;
         let {uid} = data;
         let res = {code: 0, msg: ""};
-        const whereJson  = {
+        const whereJson = {
             accountType: 2
         }
         if (!vk.pubfn.isNull(data.keyword)) whereJson['company.companyName'] = new RegExp(data.keyword);
         if (!vk.pubfn.isNull(data.isCoop)) whereJson.isCoop = data.isCoop;
-        if (vk.pubfn.isNull(data.province) && data.province && data.province.length > 0) {
+        if (!vk.pubfn.isNull(data.province) && data.province && data.province.length > 0) {
             whereJson['businessCard.address.province.code'] = _.in(data.province);
         }
-        if (vk.pubfn.isNull(data.mainSpotCategoryIds) && data.mainSpotCategoryIds && data.mainSpotCategoryIds.length > 0) {
+        if (!vk.pubfn.isNull(data.city) && data.city && data.city.length > 0) {
+            whereJson['businessCard.address.city.code'] = _.in(data.city);
+        }
+        if (!vk.pubfn.isNull(data.mainSpotCategoryIds) && data.mainSpotCategoryIds && data.mainSpotCategoryIds.length > 0) {
             whereJson['businessCard.mainSpotCategoryIds'] = _.in(data.mainSpotCategoryIds);
         }
         // 业务逻辑开始-----------------------------------------------------------
         res = await vk.baseDao.select({
             dbName: dbName.user,
             whereJson,
-            pageSize: -1
+            pageSize: -1,
+            pageIndex: 1,
+            sortArr: [{"name": "_id", "type": "desc"}],
         });
         console.log('whereJson', whereJson)
         // 业务逻辑结束-----------------------------------------------------------