no message

src/biz/member/apply.ts

@@ -362,7 +362,7 @@ export async function infomationChangeList({name, changeState, pageNumber}) {
     if (changeState) {
         selectParam.infoChangeOptionType = changeState;
     }
-    let dbList = await findToPage(TABLEENUM.用户表, selectParam, ["userId", "unitName", "infoChangeId"], pageNumber);
+    let dbList = await findToPage(TABLEENUM.用户表, selectParam, ["userId", "unitName", "infoChangeId", "uscc", "legalPerson", "unitMemberType"], pageNumber);
     let dataCount = await findCount(TABLEENUM.用户表, selectParam);
 
     let dataList = [];
@@ -380,7 +380,15 @@ export async function infomationChangeList({name, changeState, pageNumber}) {
             uusinessLicenseUrl:logInfo.uusinessLicenseUrl,
             applicationForm:logInfo.applicationForm,
             desc:logInfo.desc,
+            unitNameChange:false,
+            usccChange:false,
+            unitMemberTypeChange:false,
+            legalPersonChange:false,
         };
+        if (logInfo.unitName != info.unitName) item.unitNameChange = true;
+        if (logInfo.uscc != info.uscc) item.usccChange = true;
+        if (logInfo.unitMemberType != info.unitMemberType) item.unitMemberTypeChange = true;
+        if (logInfo.legalPerson != info.legalPerson) item.legalPersonChange = true;
         dataList.push(item);
     }
 

src/biz/member/finance/costVerification.ts

@@ -32,7 +32,7 @@ import { successResult } from "../../../tools/system";
  * @param pageNumber 当前页
  */
 export async function paidList({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, payType, costType, pageNumber, examineState}) {
-    if (payType != 1 && payType != 2) throw new BizError(ERRORENUM.参数错误);
+    if (payType != 1 && payType != 2 && payType != 3) throw new BizError(ERRORENUM.参数错误);
     eccEnumValue("财务核对列表", "会费类别", COSTTYPE, costType );
 
     let findParam:any = {
@@ -40,7 +40,7 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
     }
     if (payType == 1) {
         findParam.paymentMethod = PAYMENTTYPE.微信支付;
-    } else {
+    } else if (payType == 2) {
         findParam.paymentMethod = {"$ne":PAYMENTTYPE.微信支付};
     }
 

src/biz/member/finance/invoice.ts

@@ -34,7 +34,7 @@ import { successResult } from "../../../tools/system";
  * @param pageNumber 当前页
  */
 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.参数错误);
+    if (payState != 1 && payState != 2 && payState != 3) throw new BizError(ERRORENUM.参数错误);
     let findParam:any = {};
     if (invoiceState) {
         if (invoiceState == 1) {//已申请
@@ -45,7 +45,7 @@ export async function billStateList({name, memberType, documentId, phone, mail,
     }
     if (payState == 1) {
         findParam.state = ORDERSTATE.已支付;
-    } else {
+    } else if (payState == 2){
         findParam.state = ORDERSTATE.未支付;
     }
 

src/biz/member/order.ts

@@ -497,7 +497,7 @@ export async function accountInfo({id, form}) {
  */
 export async function refundList({name, pageNumber}) {
     let findParam:any = { 
-        isReceive:ISRECEIVE.提供账户_zkh需退款_ykh
+        isReceive:{"$ne":null}
     };
     
     let checkUserIdList = []
@@ -517,13 +517,13 @@ export async function refundList({name, pageNumber}) {
         findParam.userId = {"$in":checkUserIdList}
     }
 
-    let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "memberCategory", "userId", "refundBankCarId", "refundBankName", "refundSuccessful", "isReplenishReturnInfo" ];
+    let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "memberCategory", "userId", "refundBankCarId", "refundBankName", "refundSuccessful", "isReplenishReturnInfo", "desc" ];
     let dbList = await findToPage(TABLEENUM.订单表, findParam, selectFile, pageNumber);
     let dataCount = await findCount(TABLEENUM.订单表, findParam);
 
     let dataList = [];
 
-    let itemFile = ["id", "name", "unitName", "money", "userId", "memberCategory", "refundBankCarId", "refundBankName"];
+    let itemFile = ["id", "name", "unitName", "money", "userId", "memberCategory", "refundBankCarId", "refundBankName", "desc"];
     
     for (let i = 0; i < dbList.length; i++) {
         let info = dbList[i];

src/data/models/model.ts

@@ -507,7 +507,7 @@ const ModelArray = [
             payTime:'Number',//支付时间
             //2.0新加
             invoiceMail:'String',//发票邮箱
-            desc:'String',//描述
+            desc:'String',//用户反馈描述
             isReceive:{type:"Number", default:0},//退回理由中的是否受到款项【财务核对页收款退回】 ISRECEIVE
             returnsReasons:'String',//退回理由中的退回理由描述【财务核对页收款退回】
             //退款信息

src/routers/order/router.ts

@@ -52,7 +52,7 @@ export const Config = {
                 {key:"memberLevel", type:"[Number]", desc:"个人级别职务", isNull:true},
                 // {key:"paymentType", type:"Number", desc:"支付方式", isNull:true},2024年12月21日去掉
                 {key:"examineState", type:"Number", desc:"审批状态 0是全部，1是待审批2是已审批", isNull:true},
-                {key:"payType", type:"Number", desc:"支付方式 1是微信支付 2是线下支付"},
+                {key:"payType", type:"Number", desc:"支付方式 1是微信支付 2是线下支付 3全部"},
                 {key:"costType", type:"Number", desc:"会费类别", isNull:true},
                 {key:"pageNumber", type:"Number", desc:"分页-当前页面"}
             ],
@@ -71,7 +71,7 @@ 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:"payState", type:"Number", desc:"支付状态 1是已支付 2是未支付"},
+                {key:"payState", type:"Number", desc:"支付状态 1是已支付 2是未支付 3是全部"},
                 {key:"invoiceState", type:"Number", desc:"发票状态 0是全部 1是已申请 2是未申请",  isNull:true},
                 {key:"weChartPR", type:"String", desc:"微信支付单号", isNull:true},
                 {key:"pageNumber", type:"Number", desc:"分页-当前页面"}