no message

src/biz/member/order.ts

@@ -495,23 +495,42 @@ export async function accountInfo({id, form}) {
  * 退款列表
  * @param param0 
  */
-export async function refundList({name, pageNumber}) {
+export async function refundList({name, memberType, joinStartTime, joinEndTime, pageNumber}) {
     let findParam:any = { 
         isReceive:ISRECEIVE.提供账户_zkh需退款_ykh
     };
     
+    /**用户表查询条件 */
     let checkUserIdList = []
+    let itemParam:any = {};
+    let isSelectUser = false;
     if (name) {
-        let itemParam = {
+        isSelectUser = true;
+        itemParam = {
             "$or":[
                 {unitName:{"$regex":`${name}`}},
                 {name:{"$regex":`${name}`}}
             ]
         }
+    }
+    if (memberType && memberType.length) {
+        isSelectUser = true;
+        itemParam["$or"] = [ {unitMemberType:{"$in":memberType}}, {individualMemberType:{"$in":memberType}} ];
+    }
+    if (joinStartTime) {
+        isSelectUser = true;
+        itemParam["joinTime"] = {"$gt":joinStartTime};
+    }
+    if (joinEndTime) {
+        isSelectUser = true;
+        if (!itemParam["joinTime"]) itemParam["joinTime"] = {};
+        itemParam["joinTime"]["$lt"] = joinEndTime;
+    }
+    if (isSelectUser) {
         let checkUserIdDataList = await find(TABLEENUM.用户表, itemParam, ["userId"]);
         checkUserIdDataList.forEach(key => {
             checkUserIdList.push(key.userId); 
-        }); 
+        });
     }
     if (checkUserIdList.length) {
         findParam.userId = {"$in":checkUserIdList}

src/routers/order/router.ts

@@ -209,6 +209,9 @@ export const Config = {
             subUrl:'/order/refundlist',
             param:[
                 {key:"name", type:"String", desc:"名称", isNull:true},
+                {key:"joinStartTime", type:"Number", desc:"入会开始时间", isNull:true},
+                {key:"joinEndTime", type:"Number", desc:"入会结束时间", isNull:true},
+                {key:"memberType", type:"[Number]", desc:"会员类别", isNull:true},
                 {key:"pageNumber", type:"Number", desc:"当前页"},
             ],
             bindBiz:orderBiz.refundList