no message

src/biz/member/finance/costVerification.ts

@@ -95,11 +95,11 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
     if (phone) findParam.phone = phone;
     if (examineState) {
         if (examineState == 1) {
-            findParam.confirmReceipt = {"$ne": RECEIPTCONFIRMATION.收款确认};
+            findParam.confirmReceipt = RECEIPTCONFIRMATION.待确认;
         } else {
             findParam.confirmReceipt = RECEIPTCONFIRMATION.收款确认;
         }
-    }
+    } else findParam.confirmReceipt = {"$ne":RECEIPTCONFIRMATION.退回}
     if (costType) findParam.isFirst = costType == COSTTYPE.首次;
 
     let selectFile = ["id", "unitName", "userId", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "isFirst", "paymentNum", "memberState", "operationTime", "confirmReceipt", "invoiceStatus" ];
@@ -125,7 +125,7 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
             itemData.paymentNum = "-";
         }
        
-        let userInfo = await findOnce(TABLEENUM.用户表, {userId:info.userId}, ["memberState", "name", "memberLevel", "individualMemberType", "unitMemberType"]);
+        let userInfo = await findOnce(TABLEENUM.用户表, {userId:info.userId}, ["userId", "memberState", "name", "memberLevel", "individualMemberType", "unitMemberType"]);
         if (!userInfo || !userInfo.userId) continue;
         itemData.memberLevel = changeEnumValue(MEMBERLEVEL, userInfo.memberLevel);
         itemData.name = userInfo.name;

src/biz/member/finance/invoice.ts

@@ -434,7 +434,7 @@ export async function invoicedList({name, memberType, documentId, phone, mail, j
         // itemData.cycle = `${moment(info.orderCycleStart).format("YYYY-MM-DD")}至${moment(info.orderCycleEnd).format("YYYY-MM-DD")}`;
         itemData.cycle = `${moment(info.orderCycleStart).format("YYYY")}至${moment(info.orderCycleEnd).format("YYYY")}`;
         itemData.isPay = changeEnumValue(ORDERSTATE, itemData.state);
-        let userInfo = await findOnce(TABLEENUM.用户表, {userId:itemData.userId}, ["memberState", "name", "memberLevel", "individualMemberType", "unitMemberType"])
+        let userInfo = await findOnce(TABLEENUM.用户表, {userId:itemData.userId}, ["userId", "memberState", "name", "memberLevel", "individualMemberType", "unitMemberType"])
         if(userInfo) {
             if(userInfo.individualMemberType) {
                 itemData.memberType = changeEnumValue(MEMBERTYPEECCENUM, userInfo.individualMemberType);

src/biz/member/order.ts

@@ -214,7 +214,7 @@ export async function orderList({userId, type}) {
                 payState = MYORDERLISTPAYSTATE.财务查账中;
             } else if (confirmReceipt == RECEIPTCONFIRMATION.收款确认) {
                 payState = MYORDERLISTPAYSTATE.已缴费;
-            } else {
+            } else {//退回
                 if ( isReceive == ISRECEIVE.提供账户_zkh需退款_ykh ) {//收到了用户的款项的退款
                     if (isReplenishReturnInfo && refundSuccessful ) {
                         payState = MYORDERLISTPAYSTATE.退款成功;