Merge branch 'master' of http://123.207.147.179:8888/node_server/wenHuaBu_adminServer

src/biz/member/memberFees.ts

@@ -18,7 +18,7 @@ import { successResult } from "../../tools/system";
 /**
  * 已缴费列表 success
  */
-export async function getPaid({unitName, joinTime, memberType, pageNumber}) {
+export async function getPaid({unitName, joinStartTime, joinEndTime, memberType, pageNumber}) {
     const NowMs = new Date().valueOf();
     /**到期时间距离今天大于90天 */
     let selectParam:any = {
@@ -31,7 +31,12 @@ export async function getPaid({unitName, joinTime, memberType, pageNumber}) {
     }
 
     if (unitName) selectParam.unitName = unitName;
-    if (joinTime) selectParam.joinTime = joinTime;
+    if (joinStartTime && joinEndTime) {
+        selectParam["$and"].push(
+            { "joinTime":{"$gt":joinStartTime} },
+            { "joinTime":{"$lt":joinEndTime} }
+        )
+    }
     if (memberType) selectParam.memberType = memberType;
 
     const SelectFiles = ["userId", "memberState", "unitName", "loginId", "phone", "joinTime", "memberType", "lifespanStartTime", "lifespanEndTime", "memberLevel"];

src/routers/member/router.ts

@@ -387,7 +387,8 @@ export const Config = {
             subUrl:'/memberfees/paid', 
             param:[
                 {key:"unitName", type:"String", desc:"单位名称", isNull:true},
-                {key:"joinTime", type:"Number", 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:"当前页"}
             ],