no message

src/config/enum.ts

@@ -402,11 +402,26 @@ export enum ISPAYENUM {
     未支付
 }
 
+/**
+ * 发票状态
+ */
 export enum INVOICESTATUS{
-    未开发票 = 1,
-    已开发票
+    不具备开票条件 = 1,
+    已开发票 = 2,
+    未开发票,
+    退回
 }
 
+/**
+ * 发票状态 前端用
+ */
+export enum INVOICESTATUSCLIENT{
+    全部 = 0,
+    已开发票 = 2,
+    未开发票,
+}
+
+
 
 /*
  * 短信类型

src/config/errorEnum.ts

@@ -26,7 +26,10 @@ export enum ERRORENUM {
     验证码失效,
     验证码过期,
     重复提交,
-    无法获取未来届次
+    无法获取未来届次,
+    微信支付无法被退回,
+    订单状态无法开具发票,
+    微信支付无法退回发票请求
 }
 
 export enum ERRORCODEENUM {

src/data/models/model.ts

@@ -53,7 +53,7 @@
     },
  */
 
-import { MEMBERSTATE, RECEIPTCONFIRMATION, REGISTERFLOW, USERREGISTERSTATE } from "../../config/enum";
+import { INVOICESTATUS, MEMBERSTATE, RECEIPTCONFIRMATION, REGISTERFLOW, USERREGISTERSTATE } from "../../config/enum";
 
 
 
@@ -435,20 +435,22 @@ const ModelArray = [
             orderCycleStart:'Number',//订单周期开始时间
             orderCycleEnd:'Number',//订单周期结束时间
             money:'String',//金额
-            memberId:'String',//会员id
-            loginId:'String',//登陆名
+            userId:{type:'String', index:true},//会员id
+            loginId:{type:'String', index:true},//登陆名
             phone:"String",//登陆手机号
             paymentNum:'String',//支付单号（与订单号不一样）
             // membershipFeesType:'Number',//会费类别 枚举
             invoiceAdd:'String',//发票图片地址
-            state:'Number',//状态 是否支付 枚举 ORDERSTATE
-            firstExamine:{type:'Boolean', default:false},//首次订单的审批开关
             isFirst:{type:'Boolean', default:true},//首次订单
-            invoiceStatus:{type:'Number', index:true},//发票状态 枚举 INVOICESTATUS
+            state:'Number',//状态 是否支付 枚举 ORDERSTATE
             paymentMethod:'Number',//付款方式 枚举  PAYMENTTYPE
-            memberCategory:'Number',//会员类别 枚举  MEMBERTYPE
-            confirmReceipt:{type:'Number', default:RECEIPTCONFIRMATION.待确认},//收款确认
-            weChartPR:"String",//微信订单号
+            firstPayExamine:{type:'Boolean', default:false},//首次订单的审批开关【待支付页审批开关】
+            confirmReceipt:{type:'Number', default:RECEIPTCONFIRMATION.待确认},//收款确认【财务核对页收款确认】
+            invoiceStatus:{type:'Number', default:INVOICESTATUS.不具备开票条件, index:true},//发票状态 枚举 INVOICESTATUS 【待开发票页上传发票之后更新状态】
+            advanceInvoice:{type:'Boolean', default:false},//是否提前开票 【个人列表页提交开发票按钮】
+            
+            // memberCategory:'Number',//会员类别 枚举  MEMBERTYPE
+            // weChartPR:"String",//微信订单号
         }
     },
     {

src/routers/public/router.ts

@@ -140,7 +140,7 @@ export const Config = {
             apiName:"发票状态",
             subUrl:'/invoicestate', 
             param:[],
-            defaultParam:enumConfig.INVOICESTATUS,
+            defaultParam:enumConfig.INVOICESTATUSCLIENT,
             bindBiz:publicBiz.setEnumInterface  
         },
         {

src/routers/router.ts

@@ -15,15 +15,15 @@ import * as officalWebsiteRouter from "./officalWebsite/router";
 import * as orderRouter from "./order/router";
 import * as asyncHandler from 'express-async-handler';
 
-const Look = true;//true更新文档
+const Look = false;//true更新文档
 
 export async function setRouter(httpServer){
     if (Look) {
         await getDoc();
-        // await initDoc(portalRouter.FirstName, portalRouter.Config, portalRouter.FirstRouter);//网站编辑
+        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(officalWebsiteRouter.FirstName, officalWebsiteRouter.Config, officalWebsiteRouter.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 analysisRouter(httpServer, portalRouter.Config, portalRouter.FirstRouter);//网站编辑