no message

src/biz/member/cost.ts

@@ -141,7 +141,7 @@ export async function payCallback(body) {
                 paymentMethod:PAYMENTTYPE.微信支付,
                 payTime:new Date().valueOf(),
                 weChartState:WEICHARTPAYSTATE.已支付,
-                confirmReceipt:RECEIPTCONFIRMATION.收款确认,
+                confirmReceipt:RECEIPTCONFIRMATION.待确认,
                 confirmReceiptMs:new Date().valueOf(),
                 invoiceStatus:INVOICESTATUS.未开发票
             };

src/config/enum.ts

@@ -421,7 +421,6 @@ export enum CERTIFICATETYPE {
 export enum ORDERSTATE {
     已支付 = 1,
     未支付,
-    
 }
 
 

src/data/models/model.ts

@@ -495,7 +495,7 @@ const ModelArray = [
             isFirst:{type:'Boolean', default:true},//首次订单 
             state:'Number',//状态 是否支付 枚举 ORDERSTATE
             paymentMethod:'Number',//付款方式 枚举  PAYMENTTYPE
-            firstPayExamine:{type:'Boolean', default:false},//首次订单的审批开关【待支付页审批开关】  
+            firstPayExamine:{type:'Boolean', default:false},//首次订单的审批开关【待支付页审批开关】  去掉了
             confirmReceipt:{type:'Number', default:0},//收款确认【财务核对页收款确认】  RECEIPTCONFIRMATION
             confirmReceiptMs:{type:"Number", default:0},//审核时间  【同上 财务核对页收款确认之后更新时间】
             invoiceStatus:{type:'Number', default:INVOICESTATUS.不具备开票条件, index:true},//发票状态 枚举 INVOICESTATUS 【待开发票页上传发票之后更新状态】

src/routers/order/router.ts

 import * as orderBiz from "../../biz/member/order";
+import * as costVerificationBiz from "../../biz/member/finance/costVerification";
+import * as invoiceBiz from "../../biz/member/finance/invoice";
 
 export const FirstName = '会费相关';
 export const FirstRouter = '/manage/cost';
@@ -48,11 +50,13 @@ export const Config = {
                 {key:"joinStartTime", type:"Number", desc:"入会开始时间", isNull:true},
                 {key:"joinEndTime", type:"Number", desc:"入会结束时间", isNull:true},
                 {key:"memberLevel", type:"[Number]", desc:"个人级别职务", isNull:true},
-                {key:"paymentType", 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:"costType", type:"Number", desc:"会费类别", isNull:true},
                 {key:"pageNumber", type:"Number", desc:"分页-当前页面"}
             ],
-            bindBiz:orderBiz.paidList
+            bindBiz:costVerificationBiz.paidList
         },
         {
             apiName:"待开发票",
@@ -71,7 +75,7 @@ export const Config = {
                 {key:"weChartPR", type:"String", desc:"微信支付单号", isNull:true},
                 {key:"pageNumber", type:"Number", desc:"分页-当前页面"}
             ],
-            bindBiz:orderBiz.billStateList
+            bindBiz:invoiceBiz.billStateList
         },
         {
             apiName:"财务核对-收款确认",
@@ -79,7 +83,7 @@ export const Config = {
             param:[
                 {key:"id", type:"String", desc:"订单id"}
             ],
-            bindBiz:orderBiz.confirmReceiptPass
+            bindBiz:costVerificationBiz.confirmReceiptPass
         },
         {
             apiName:"财务核对-退回",
@@ -89,7 +93,7 @@ export const Config = {
                 {key:"isReceive", type:"Number", desc:"是否受到款项"},
                 {key:"returnsReasons", type:"String", desc:"退回理由"}
             ],
-            bindBiz:orderBiz.confirmReceiptOut
+            bindBiz:costVerificationBiz.confirmReceiptOut
         },
         {
             apiName:"财务核对-数据导出",
@@ -97,7 +101,7 @@ export const Config = {
             param:[
                 {key:"exportColumns", type:"[]", desc:"导出数据列"}
             ],
-            bindBiz:orderBiz.outPutConfirmReceipt
+            bindBiz:costVerificationBiz.outPutConfirmReceipt
         },
         {
             apiName:"财务核对-审批历史",
@@ -105,7 +109,7 @@ export const Config = {
             param:[
                 {key:"id", type:"String", desc:"订单id"},
             ],
-            bindBiz:orderBiz.confirmReceiptHistory
+            bindBiz:invoiceBiz.confirmReceiptHistory
         },
         {
             apiName:"待开发票-上传发票 已开发票-修改发票",
@@ -114,7 +118,7 @@ export const Config = {
                 {key:"id", type:"String", desc:"订单id"},
                 // {key:"invoiceUrl", type:"String", desc:"发票地址"},
             ],
-            bindBiz:orderBiz.upInvoice
+            bindBiz:invoiceBiz.upInvoice
         },
         // {
         //     apiName:"待开发票-退回发票", 弃用
@@ -130,7 +134,7 @@ export const Config = {
             param:[
                 {key:"exportColumns", type:"[]", desc:"导出数据列"}
             ],
-            bindBiz:orderBiz.outPutBillState
+            bindBiz:invoiceBiz.outPutBillState
         },
         {
             apiName:"待开发票-审批历史",
@@ -138,7 +142,7 @@ export const Config = {
             param:[
                 {key:"id", type:"String", desc:"订单id"},
             ],
-            bindBiz:orderBiz.billStateHistory
+            bindBiz:invoiceBiz.billStateHistory
         },
         {
             apiName:"待开发票-批量开票确认",
@@ -146,7 +150,7 @@ export const Config = {
             param:[
                 {key:"idList", type:"[String]", desc:"批量通过的用户列表"},
             ],
-            bindBiz:orderBiz.billStateBatchAdopt
+            bindBiz:invoiceBiz.billStateBatchAdopt
         },
         {
             apiName:"发票管理-已开发票",
@@ -164,7 +168,7 @@ export const Config = {
                 {key:"isPay", type:"Number", desc:"是否支付", isNull:true},
                 {key:"pageNumber", type:"Number", desc:"当前页"},
             ],
-            bindBiz:orderBiz.invoicedList
+            bindBiz:invoiceBiz.invoicedList
         },
         {
             apiName:"已开发票-数据导出",
@@ -172,7 +176,7 @@ export const Config = {
             param:[
                 {key:"exportColumns", type:"[]", desc:"导出数据列"}
             ],
-            bindBiz:orderBiz.outPutInvoiced
+            bindBiz:invoiceBiz.outPutInvoiced
         },
         {
             apiName:"已开发票-审批历史",
@@ -180,7 +184,7 @@ export const Config = {
             param:[
                 {key:"id", type:"String", desc:"订单id"},
             ],
-            bindBiz:orderBiz.invoicedHistory
+            bindBiz:invoiceBiz.invoicedHistory
         },
         {
             apiName:"转账单号弹窗",

src/routers/router.ts

@@ -31,16 +31,16 @@ export async function setRouter(httpServer){
         await getDoc();
         // await initDoc(portalRouter.FirstName, portalRouter.Config, portalRouter.FirstRouter);//网站编辑
         // await initDoc(publicRouter.FirstName, publicRouter.Config, publicRouter.FirstRouter);//公用组件
-        await initDoc(memberRouter.FirstName, memberRouter.Config, memberRouter.FirstRouter);//用户路由
+        // await initDoc(memberRouter.FirstName, memberRouter.Config, memberRouter.FirstRouter);//用户路由
         // await initDoc(officalWebsiteRouter.FirstName, officalWebsiteRouter.Config, officalWebsiteRouter.FirstRouter);//官网路由
-        // await initDoc(orderRouter.FirstName, orderRouter.Config, orderRouter.FirstRouter);//会费相关
+        await initDoc(orderRouter.FirstName, orderRouter.Config, orderRouter.FirstRouter);//会费相关
         // await initDoc(costRouter.FirstName, costRouter.Config, costRouter.FirstRouter);//支付
         // await initDoc(outPutRouter.FirstName, outPutRouter.Config, outPutRouter.FirstRouter);//导出路由
         // await initDoc(labelRouter.FirstName, labelRouter.Config, labelRouter.FirstRouter);//标签路由
         // await initDoc("2.0", labelRouter.Config, labelRouter.FirstRouter);//标签路由
         // await initDoc("2.0", blacklistRouter.Config, blacklistRouter.FirstRouter);//黑名单路由
         // await initDoc("2.0", msgActivityRouter.Config, msgActivityRouter.FirstRouter);//消息活动通知路由
-        await initDoc(applyRouter.FirstName, applyRouter.Config, applyRouter.FirstRouter);//变更审批路由
+        // await initDoc(applyRouter.FirstName, applyRouter.Config, applyRouter.FirstRouter);//变更审批路由
     }
     analysisRouter(httpServer, portalRouter.Config, portalRouter.FirstRouter, true);//网站编辑
     analysisRouter(httpServer, publicRouter.Config, publicRouter.FirstRouter, false);//公用组件