no message

src/biz/member/finance/invoice.ts

@@ -413,13 +413,14 @@ export async function billStateBatchAdopt({idList}) {
  * @param mail 单位/个人邮箱
  * @param joinStartTime 入会开始时间
  * @param joinEndTime 入会结束时间
+ * @param operationTime 已开票时间
  * @param memberLevel 会员级别/职务 多选
  * 会员级别/职务：【普通会员、理事会员、常务理事会员】
  * @param paymentType 支付方式
  * @param isPay 是否支付
  * @param pageNumber 当前页
  */
-export async function invoicedList({name, memberType, documentId, invoiceExamineTime, phone, mail, joinStartTime, joinEndTime, memberLevel, paymentType, isPay, weChartPR, pageNumber}) {
+export async function invoicedList({name, memberType, documentId, invoiceExamineTime, phone, mail, operationStartTime, operationEndTime, memberLevel, paymentType, isPay, weChartPR, pageNumber}) {
     eccEnumValue("发票列表", "支付类型", PAYMENTTYPE, paymentType);
     eccEnumValue("发票列表", "是否支付", ISPAYENUM, isPay );
 
@@ -456,15 +457,6 @@ export async function invoicedList({name, memberType, documentId, invoiceExamine
         isSelectUser = true;
         itemParam.mail = mail;
     }
-    if (joinStartTime) {
-        isSelectUser = true;
-        itemParam["joinTime"] = {"$gt":joinStartTime};
-    }
-    if (joinEndTime) {
-        isSelectUser = true;
-        if (!itemParam["joinTime"]) itemParam["joinTime"] = {};
-        itemParam["joinTime"]["$lt"] = joinEndTime;
-    }
     if (memberLevel && memberLevel.length) {
         isSelectUser = true;
         itemParam.memberLevel = {"$in":memberLevel};
@@ -488,6 +480,17 @@ export async function invoicedList({name, memberType, documentId, invoiceExamine
     let dbList = await findToPage(TABLEENUM.订单表, findParam, selectFile, pageNumber);
     let dataCount = await findCount(TABLEENUM.订单表, findParam);
 
+    let historyParam:any = {};
+    if (operationStartTime) {
+        isSelectUser = true;
+        historyParam["operationTime"] = {"$gt":operationStartTime};
+    }
+    if (operationEndTime) {
+        isSelectUser = true;
+        if (!historyParam["operationTime"]) historyParam["operationTime"] = {};
+        historyParam["operationTime"]["$lt"] = operationEndTime;
+    }
+
     let dataList = [];
 
     let itemFile = ["id", "unitName", "money", "paymentNum", "state", "userId", "memberCategory", "paymentMethod", "desc"];
@@ -537,7 +540,7 @@ export async function invoicedList({name, memberType, documentId, invoiceExamine
         selectConf.push(info.value);
     })
     
-    let selectFile = ["id", "unitName", "userId", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "paymentNum", "desc", "invoiceMail", "confirmReceiptMs", "payTime"];
+    let selectFile = ["id", "unitName", "userId", "orderCycleStart", "orderCycleEnd", "operationTime", "money", "paymentMethod", "memberCategory", "paymentNum", "desc", "invoiceMail", "confirmReceiptMs", "payTime"];
     let dbList = await find(TABLEENUM.订单表, findParam, selectFile);
     let timeChnageList = ["orderCycleStart", "operationTime", "confirmReceiptMs", "payTime"];