no message

src/biz/member/finance/costVerification.ts

@@ -115,7 +115,8 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
     
     // if (costType) findParam.isFirst = costType == COSTTYPE.首次;
 
-    let selectFile = ["id", "unitName", "userId", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "isFirst", "payTime", "paymentNum", "memberState", "operationTime", "confirmReceipt", "invoiceStatus" ];
+    let selectFile = ["id", "unitName", "userId", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", 
+    "isFirst", "payTime", "paymentNum", "memberState", "operationTime", "confirmReceipt", "invoiceStatus" ];
     let dbList = await findToSortToPage(TABLEENUM.订单表, findParam, selectFile, {payTime:-1}, pageNumber, pageSize);
     let dataCount = await findCount(TABLEENUM.订单表, findParam);
 

src/biz/member/finance/invoice.ts

@@ -130,13 +130,15 @@ export async function billStateList({name, memberType, documentId, invoiceApplyM
     }
     if (weChartPR) findParam.paymentNum = {"$regex":`${weChartPR}`};
 
-    let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "payTime", "invoiceTime", "paymentMethod", "memberCategory", "state", "paymentNum", "userId", "desc", "invoiceMail", "weChartCreatePayMs", "invoiceStatus"];
+    let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "payTime", "invoiceTime", "paymentMethod", "memberCategory", "state", 
+    "paymentNum", "userId", "desc", "invoiceMail", "weChartCreatePayMs", "invoiceStatus", "confirmReceipt"];
     let dbList = await findToSortToPage(TABLEENUM.订单表, findParam, selectFile, {payTime:-1, confirmReceiptMs:-1},pageNumber, pageSize);
     let dataCount = await findCount(TABLEENUM.订单表, findParam);
 
     let dataList = [];
 
-    let itemFile = ["id", "userId", "unitName", "money", "paymentNum", "memberCategory", "state", "paymentMethod", "desc", "invoiceMail", "weChartCreatePayMs", "invoiceStatus"];
+    let itemFile = ["id", "userId", "unitName", "money", "paymentNum", "memberCategory", "state", "paymentMethod", "desc", "invoiceMail", 
+    "weChartCreatePayMs", "invoiceStatus"];
     for (let i= 0; i < dbList.length; i++) {
         let info = dbList[i];
         let itemData:any = extractData(info, itemFile);
@@ -145,9 +147,12 @@ export async function billStateList({name, memberType, documentId, invoiceApplyM
         itemData.joinTime = moment(info.orderCycleStart).format("YYYY-MM-DD");
         itemData.memberType = changeEnumValue(MEMBERTYPE, itemData.memberCategory);
         itemData.paymentMethod = changeEnumValue(PAYMENTTYPE, itemData.paymentMethod);
-        itemData.isPay = changeEnumValue(ORDERSTATE, itemData.state);
+        // itemData.isPay = changeEnumValue(ORDERSTATE, itemData.state);
        
-        itemData.payState = info.state == ORDERSTATE.已支付 ? "已支付" : "未支付";
+        if(info.confirmReceipt == RECEIPTCONFIRMATION.收款确认 && info.state == ORDERSTATE.已支付) itemData.isPay = "已支付";
+        else if (info.confirmReceipt != RECEIPTCONFIRMATION.收款确认 && info.state == ORDERSTATE.已支付) itemData.isPay = "核对中"; //费用核对里待审批和驳回列表里的数据都会显示核对中
+        // else if (info.refundSuccessful) itemData.isPay = "已退回";
+        else itemData.isPay = "未支付";
         let userInfomation = await findOnce(TABLEENUM.用户表, {userId:itemData.userId}, ["userId", "memberState", "name", "memberLevel", "individualMemberType", "unitMemberType"]);
         if (!userInfomation || !userInfomation.userId) continue;
         if(userInfomation) {

src/biz/member/order.ts

@@ -464,7 +464,7 @@ export async function reasonInfo({id}) {
         let operationBehaviorStr = changeEnumValue(ORDEREXAMINE, info.operationBehavior);
         if (info.operationBehavior == ORDEREXAMINE.用户提交) isReceiveMoney = "未收到/已收到"; //线下付款
         else {
-            if (isReceiveMoney) { //判断是否收到款项
+            if (info.isReceiveMoney) { //判断是否收到款项
                 if (info.operationBehavior == ORDEREXAMINE.驳回) operationBehaviorStr = `${changeEnumValue(ORDEREXAMINE, info.operationBehavior)}-不需退款`;
                 isReceiveMoney = "未收到/已收到"
             } else {
@@ -544,12 +544,13 @@ export async function accountInfo({id, form}) {
  * @param param0 
  */
 export async function refundList({name, memberType, joinStartTime, joinEndTime, pageNumber}) {
+    // info.confirmReceipt == RECEIPTCONFIRMATION.收款确认 ? "已审批" : "待审批";
     let findParam:any = { 
-        isReceive:{"$gt":0}
-        // "$or":[
-        //     {isReceive:{"$gt":0}, state:ORDERSTATE.未支付},
-        //     {isReceive:{"$gt":1}, state:ORDERSTATE.已支付}
-        // ]
+        // isReceive:{"$gt":0}, confirmReceipt:RECEIPTCONFIRMATION.退回
+        "$or":[
+            {isReceive:{"$gt":0}, confirmReceipt:RECEIPTCONFIRMATION.退回},
+            {refundSuccessful:true}
+        ]
     };
     
     /**用户表查询条件 */