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

src/biz/member/memberFees.ts

@@ -15,10 +15,12 @@ import { changeEnumValue } from "../../util/verificationEnum";
  */
 export async function getPaid({unitName, joinTime, memberType, pageNumber}) {
     let now = new Date().valueOf();
-    let selectParam:any = {"$and":[
-        {lifespanStartTime:{"$lt":now}},
-        {lifespanEndTime:{"$gt":now}}
-    ]};
+    /**到期时间距离今天大于90天 */
+    let selectParam:any = {"$expr":{
+        "$gt":[{
+            "$subtract":["$lifespanEndTime", now]
+        }, 90]
+    }};
 
     if (unitName) selectParam.unitName = unitName;
     if (joinTime) selectParam.joinTime = joinTime;
@@ -49,10 +51,19 @@ export async function getPaid({unitName, joinTime, memberType, pageNumber}) {
  * 续费期
  */
 export async function getRenewalPeriod() {
-    
-}
+    let now = new Date().valueOf();
+    /**到期时间距离今天等于90天至1天 */
+    let selectParam:any = {"$expr":{
+        "$and":[
+            {"$lte":[{ "$subtract":["$lifespanEndTime", now] }, 90]},
+            {"$gt":[{ "$subtract":["$lifespanEndTime", now] }, 1]},
+        ]}
+    };
 
 
+
+}
+
 /**
  * 欠费
  */