1、新增旧货市场

2、新增用户等级

uniCloud-aliyun/cloudfunctions/router/service/client/process/sheet/pub/getList.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, userId, pageIndex, pageSize, keyword, categoryIds, provinceCodes, formData} = data;
+        let {uid, userId, pageIndex, pageSize, keyword, categoryIds, provinceCodes, formData, status} = data;
         let res = {code: 0, msg: ""};
         // 业务逻辑开始-----------------------------------------------------------
         const dbName = "jjx-process-sheet";
@@ -30,17 +30,19 @@ module.exports = {
         }
 
         if (formData && formData.hasOwnProperty('categoryIds') && vk.pubfn.isNotNull(formData.categoryIds)) {
-            whereJson.categoryIds = _.in(formData.categoryIds)
-        }
-
-        if (vk.pubfn.isNotNull(categoryIds)) {
-            whereJson.categoryIds = _.in(categoryIds)
+            whereJson.productList = _.in(formData.categoryIds)
         }
 
         if (vk.pubfn.isNotNull(provinceCodes)) {
             whereJson['address.province.code'] = _.in(provinceCodes)
         }
 
+        if (vk.pubfn.isNotNull(status) && status !== 'all') {
+            if (status === 'noQuote') whereJson.quoteNum = 0
+            else if (status === 'notPick') whereJson.status = 0
+            else if (status === 'picked') whereJson.status = 1
+        }
+
         res = await vk.baseDao.selects({
             dbName,
             pageIndex,
@@ -70,15 +72,68 @@ module.exports = {
         });
 
         for (const item of res.rows) {
-            const index = res.rows.indexOf(item);
-            res.rows[index].quoteNum = await vk.baseDao.count({
+            item.quoteList = await vk.baseDao.selects({
                 dbName: 'jjx-process-quote',
-                whereJson:{
-                    sheetId: item._id
-                }
+                whereJson: {
+                    sheetId: item._id,
+                },
+                foreignDB: [
+                    {
+                        dbName: "uni-id-users",
+                        localKey: "userId",
+                        foreignKey: "_id",
+                        as: "user",
+                        limit: 1, // limit=1则以对象形式返回
+                        fieldJson: {
+                            _id: true,
+                            company: {
+                                companyName: true,
+                                mobile: true,
+                            },
+                            person: {
+                                personName: true,
+                                mobile: true,
+                            },
+                            businessCard: true,
+                            accountType: true,
+                        },
+                    }
+                ]
             })
         }
 
+        res.notPickNum = await vk.baseDao.count({
+            dbName,
+            whereJson: {
+                userId: uid,
+                status: 0
+            },
+        });
+
+        res.pickedNum = await vk.baseDao.count({
+            dbName,
+            whereJson: {
+                userId: uid,
+                status: 1
+            },
+        });
+
+
+        res.noQuoteNum = await vk.baseDao.count({
+            dbName,
+            whereJson: {
+                userId: uid,
+                quoteNum: 0
+            },
+        });
+
+        res.all = await vk.baseDao.count({
+            dbName,
+            whereJson: {
+                userId: uid,
+            },
+        });
+
         // 业务逻辑结束-----------------------------------------------------------
         return res;
     }