no message

src/biz/member/finance/costVerification.ts

@@ -93,10 +93,12 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
     }
 
     if (phone) findParam.phone = phone;
+    if (examineState) {
         if (examineState == 1) {
-        findParam.confirmReceipt = RECEIPTCONFIRMATION.收款确认;
-    } else {
             findParam.confirmReceipt = {"$ne": RECEIPTCONFIRMATION.收款确认};
+        } else {
+            findParam.confirmReceipt = RECEIPTCONFIRMATION.收款确认;
+        }
     }
     if (costType) findParam.isFirst = costType == COSTTYPE.首次;
 
@@ -122,7 +124,8 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
             itemData.paymentMethod = "-";
             itemData.paymentNum = "-";
         }
-        let userInfo = await findOnce(TABLEENUM.用户表, {userId:info.userId}, ["memberState", "name", "memberLevel"]);
+        let userInfo = await findOnce(TABLEENUM.用户表, {userId:info.userId}, ["userId", "memberState", "name", "memberLevel"]);
+        if (!userInfo || !userInfo.userId) continue;
         itemData.memberLevel = changeEnumValue(MEMBERLEVEL, userInfo.memberLevel);
         itemData.name = userInfo.name;
 
@@ -211,7 +214,7 @@ export async function confirmReceiptOut({id, isReceive, returnsReasons}) {
         operationTime:new Date().valueOf(),
         operationBehavior:ORDEREXAMINE.驳回,
         isReceiveMoney:isReceive == ISRECEIVE.未收到款项_xg其他,
-        remarks:`${changeEnumValue(ISRECEIVE, isReceive)}`
+        remarks:`${returnsReasons}`,
     };
     await addOneData(TABLEENUM.订单审批历史表, addLogInfo );
 

src/biz/member/finance/invoice.ts

@@ -33,11 +33,21 @@ import { successResult } from "../../../tools/system";
  * @param weChartPR 微信订单号
  * @param pageNumber 当前页
  */
-export async function billStateList({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, paymentType, isPay, weChartPR, pageNumber}) {
-    eccEnumValue("发票列表", "是否支付", ISPAYENUM, isPay );
-    let findParam:any = { 
-        invoiceStatus:INVOICESTATUS.未开发票
-    };
+export async function billStateList({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, payState,paymentType, invoiceState, weChartPR, pageNumber}) {
+    if (payState != 1 && payState != 2) throw new BizError(ERRORENUM.参数错误);
+    let findParam:any = {};
+    if (invoiceState) {
+        if (invoiceState == 1) {//已申请
+            findParam.invoiceStatus = INVOICESTATUS.未开发票
+        } else {//未申请
+            findParam["$or"] = [{invoiceStatus:INVOICESTATUS.不具备开票条件}, {invoiceStatus:INVOICESTATUS.退回}];
+        }
+    }
+    if (payState == 1) {
+        findParam.state = ORDERSTATE.已支付;
+    } else {
+        findParam.state = ORDERSTATE.未支付;
+    }
 
     /**用户表查询条件 */
     let checkUserIdList = []
@@ -92,7 +102,6 @@ export async function billStateList({name, memberType, documentId, phone, mail,
         eccEnumValue("发票列表", "支付类型", PAYMENTTYPE, paymentType);
         findParam.paymentMethod = paymentType;
     }
-    if (isPay) findParam.state = isPay;
     if (weChartPR) findParam.paymentNum = {"$regex":`${weChartPR}`};
 
     let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "state", "paymentNum", "userId", "desc", "invoiceMail", "weChartCreatePayMs"];
@@ -112,7 +121,8 @@ export async function billStateList({name, memberType, documentId, phone, mail,
         itemData.paymentMethod = changeEnumValue(PAYMENTTYPE, itemData.paymentMethod);
         itemData.isPay = changeEnumValue(ORDERSTATE, itemData.state);
         let userInfomation = await findOnce(TABLEENUM.用户表, {userId:itemData.userId}, ["userId", "memberState", "name"]);
-        itemData.memberState = changeEnumValue(MEMBERSTATE, userInfomation.memberState);
+        if (!userInfomation || !userInfomation.userId) continue;
+        itemData.payState = info.state == ORDERSTATE.已支付 ? "已支付" : "未支付";
         // 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.weChartCreatePayMs = moment(info.weChartCreatePayMs || info.payTime).format("YYYY-MM-DD");

src/biz/member/order.ts

@@ -644,9 +644,9 @@ export async function approveLog({id}) {
 
         let addInfo:any = {
             operationTime:moment(operationTime).format("YYYY-MM-DD HH:mm:SS"),
-            operationBehavior:changeEnumValue(ORDEREXAMINE, info.operationBehavior),
-            desc:remarks,
-            other:""
+            operationBehavior:changeEnumValue(ORDEREXAMINE, operationBehavior),
+            desc:isReceiveMoney ? changeEnumValue(ISRECEIVE, ISRECEIVE.未收到款项_xg其他) : changeEnumValue(ISRECEIVE, ISRECEIVE.提供账户_zkh需退款_ykh),
+            other:remarks
         };
         dataList.push(addInfo);
         

src/data/models/model.ts

@@ -628,6 +628,7 @@ const ModelArray = [
             isReceiveMoney:{type:'Boolean', default:false},//是否收到款项
             remarks:{ type:'String' },//备注
             refundImgUrl:"String"//退款确认发票地址
+
         }
     },
     {

src/routers/order/router.ts

@@ -71,7 +71,8 @@ export const Config = {
                 {key:"joinEndTime", type:"Number", desc:"入会结束时间", isNull:true},
                 {key:"memberLevel", type:"[Number]", desc:"个人级别职务", isNull:true},
                 {key:"paymentType", type:"Number", desc:"支付方式", isNull:true},
-                {key:"isPay", type:"Number", desc:"是否支付", isNull:true},
+                {key:"payState", type:"Number", desc:"支付状态 1是已支付 2是未支付"},
+                {key:"invoiceState", type:"Number", desc:"发票状态 0是全部 1是已申请 2是未申请",  isNull:true},
                 {key:"weChartPR", type:"String", desc:"微信支付单号", isNull:true},
                 {key:"pageNumber", type:"Number", desc:"分页-当前页面"}
             ],

src/util/verificationEnum.ts

@@ -47,6 +47,8 @@ export function changeEnumValue(enumConf, value:any) {
         if(/_ju/.test(str)) str = str.replace(/_ju/, "。");
         if(/_hgh/.test(str)) str = str.replace(/_hgh/, "-");
         if(/_kbh/.test(str)) str = str.replace(/_kbh/, "");
+        if(/_xg/.test(str)) str = str.replace(/_xg/, "");
+        
         return str
     }
     let str = "";
@@ -61,6 +63,7 @@ export function changeEnumValue(enumConf, value:any) {
         if(/_hgh/.test(str)) str = str.replace(/_hgh/, "-");
         if(/_kbh/.test(str)) str = str.replace(/_kbh/, "");
         if(/_xg/.test(str)) str = str.replace(/_xg/, "/");
+        if(/_xg/.test(str)) str = str.replace(/_xg/, "");
         str += subStr;
         if (index == value.length-1) str+="";
         else str += ","