no message

src/biz/member/finance/invoice.ts

@@ -356,7 +356,7 @@ export async function billStateBatchAdopt({idList}) {
  * @param isPay 是否支付
  * @param pageNumber 当前页
  */
-export async function invoicedList({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, paymentType, isPay, pageNumber}) {
+export async function invoicedList({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, paymentType, isPay, weChartPR, pageNumber}) {
     eccEnumValue("发票列表", "支付类型", PAYMENTTYPE, paymentType);
     eccEnumValue("发票列表", "是否支付", ISPAYENUM, isPay );
 
@@ -414,7 +414,8 @@ export async function invoicedList({name, memberType, documentId, phone, mail, j
     
     if (phone) findParam.phone = phone;
     if (paymentType) findParam.paymentMethod = paymentType;
-    if (isPay) findParam.state = isPay
+    if (isPay) findParam.state = isPay;
+    if (weChartPR) findParam.paymentNum = {"$regex":`${weChartPR}`};
 
     let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "state", "paymentNum", "userId", "desc"];
     let dbList = await findToPage(TABLEENUM.订单表, findParam, selectFile, pageNumber);

src/biz/member/memberFees.ts

@@ -361,23 +361,42 @@ export async function unpaidList({name, memberType, documentId, phone, mail, joi
  * 会员级别/职务：【普通会员、理事会员、常务理事会员】
  * @param pageNumber 当前页
  */
-export async function getRenewalPeriod({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, pageNumber}) {
+export async function getRenewalPeriod({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, arrears,pageNumber}) {
     const NowMs = new Date().valueOf();
     //lifespanEndTime:{"$gt":NowMs + (90 * 24 * 3600 * 1000), "$gt":NowMs},
     let selectParam:any = {
-        "$or":[
+        
+        userRegisterState:USERREGISTERSTATE.通过,
+        isAdmin:STATE.否,
+    }
+    if (arrears) {
+        if (arrears == 1) {//已欠费
+            selectParam["$or"] = [
+                { 
+                    isGracePeriod:STATE.否, 
+                    lifespanEndTime:{"$lt":NowMs}
+                }, 
+                {
+                    isGracePeriod:STATE.是, 
+                    lifespanEndTime:{"$lt":NowMs},
+                    gracePeriodEndTime:{"$lt":NowMs}
+                }
+            ];
+        } else { //宽限期
+            selectParam.lifespanEndTime = {"$lt":NowMs + (90 * 24 * 3600 * 1000), "$gt":NowMs};
+        }
+    } else {
+        selectParam["$or"] = [
             { 
                 isGracePeriod:STATE.否, 
                 lifespanEndTime:{"$lt":NowMs}
             }, 
             {
                 isGracePeriod:STATE.是, 
-                lifespanEndTime:{"$lt":NowMs},
+                lifespanEndTime:{"$lt":NowMs + (90 * 24 * 3600 * 1000)},
                 gracePeriodEndTime:{"$lt":NowMs}
             }
-        ],
-        userRegisterState:USERREGISTERSTATE.通过,
-        isAdmin:STATE.否,
+        ];
     }
     if (name){
         if (!selectParam["$and"]) selectParam["$and"] = [];

src/routers/member/router.ts

@@ -665,6 +665,7 @@ export const Config = {
                 {key:"joinStartTime", type:"Number", desc:"入会开始时间", isNull:true},
                 {key:"joinEndTime", type:"Number", desc:"入会结束时间", isNull:true},
                 {key:"memberLevel", type:"[Number]", desc:"个人级别职务", isNull:true},
+                {key:"arrears", type:"Number", desc:"是否欠费 0全部 1是 2否", isNull:true},
                 {key:"pageNumber", type:"Number", desc:"当前页"}
             ],
             bindBiz:memberFeesBiz.getRenewalPeriod

src/routers/order/router.ts

@@ -167,6 +167,7 @@ export const Config = {
                 {key:"memberLevel", type:"[Number]", desc:"个人级别职务", isNull:true},
                 {key:"paymentType", type:"Number", desc:"支付方式", isNull:true},
                 {key:"isPay", type:"Number", desc:"是否支付", isNull:true},
+                {key:"weChartPR", type:"String", desc:"微信支付单号", isNull:true},
                 {key:"pageNumber", type:"Number", desc:"当前页"},
             ],
             bindBiz:invoiceBiz.invoicedList