no message

src/biz/member/examine.ts

@@ -188,7 +188,12 @@ export async function adopt({id, session}) {
     }
 
     //创建初始订单
-    await createOrder(id, userInfo.loginId, userInfo.phone, unitName, joinTime + 1000, MEMBERLEVEL.普通会员, userInfo.memberType, subType, true);
+    //创建初始订单应该使用
+    //创建今年的订单
+    let thisYear = new Date().getFullYear();
+    let orderStartMonthStr = moment(joinTime).format("MM-DD HH:mm:SS");
+    let orderStartMs = new Date(`${thisYear}-${orderStartMonthStr}`).valueOf();
+    await createOrder(id, userInfo.loginId, userInfo.phone, unitName, orderStartMs, MEMBERLEVEL.普通会员, userInfo.memberType, subType, true);
 
     await updateOneData(TABLEENUM.用户表, {userId:id}, updateInfo);
 

src/config/errorEnum.ts

@@ -75,7 +75,9 @@ export enum ERRORENUM {
     账号不存在,
     密码修改错误,
     非单位会员不可操作,
-    不存在审批历史
+    不存在审批历史,
+    发票已发送至邮请注意查看,
+    请先付款后进行发票操作
 }
 
 export enum ERRORCODEENUM {

src/data/models/model.ts

@@ -519,7 +519,7 @@ const ModelArray = [
             refundSuccessful:{type:"Boolean", default:false},//退款确认
             refundImgUrl:"String",
             //新加的状态
-            isSueInvoicesInAdvance:{type:"Boolean", default:false},//提前开票
+            isSueInvoicesInAdvance:{type:"Boolean", default:false},//提前开票 弃用
         }
     },
     {

src/routers/member/router.ts

@@ -343,7 +343,7 @@ export const Config = {
             subUrl:'/changepwd',
             notMiddleware:true,
             param:[
-                {key:"userId", type:"String", desc:"userId", notMustHave:true},
+                {key:"userId", type:"String", desc:"userId", isNull:true},
                 {key:"phone", type:"String", desc:"绑定手机号"},
                 {key:"pwd", type:"String", desc:"密码"},
                 {key:"confirmation", type:"String", desc:"二次确认密码"},
@@ -355,7 +355,7 @@ export const Config = {
             subUrl:'/getchangepwdcode',
             notMiddleware:true,
             param:[
-                {key:"userId", type:"String", desc:"userId", notMustHave:true},
+                {key:"userId", type:"String", desc:"userId", isNull:true},
                 {key:"phone", type:"String", desc:"绑定手机号"}
             ],
             bindBiz:userBiz.memberChangePwdSendCode

src/routers/order/router.ts

@@ -202,6 +202,7 @@ export const Config = {
             apiName:"退款列表",
             subUrl:'/order/refundlist',
             param:[
+                {key:"name", type:"String", desc:"名称", isNull:true},
                 {key:"pageNumber", type:"Number", desc:"当前页"},
             ],
             bindBiz:orderBiz.refundList
@@ -260,19 +261,19 @@ export const Config = {
             ],
             bindBiz:orderBiz.reconfirm
         },
+        // {
+        //     apiName:"申请发票",  弃用统一成下面的
+        //     subUrl:'/order/applicationinvoice',
+        //     param:[
+        //         {key:"id", type:"String", desc:"会员缴费列表返回id"},
+        //         {key:"memberType", type:"Number", desc:"会员类型"},
+        //         {key:"newUscc", type:"String", desc:"新的社会信用代码", isNull:true},
+        //         {key:"newUnitName", type:"String", desc:"新的发票抬头", isNull:true}
+        //     ],
+        //     bindBiz:orderBiz.applicationInvoice
+        // },
         {
-            apiName:"申请发票",
-            subUrl:'/order/applicationinvoice',
-            param:[
-                {key:"id", type:"String", desc:"会员缴费列表返回id"},
-                {key:"memberType", type:"Number", desc:"会员类型"},
-                {key:"newUscc", type:"String", desc:"新的社会信用代码", isNull:true},
-                {key:"newUnitName", type:"String", desc:"新的发票抬头", isNull:true}
-            ],
-            bindBiz:orderBiz.applicationInvoice
-        },
-        {
-            apiName:"提前开发票",
+            apiName:"开发票",
             subUrl:'/order/inadvance',
             param:[
                 {key:"id", type:"String", desc:"会员缴费列表返回id"},
@@ -282,7 +283,7 @@ export const Config = {
             bindBiz:orderBiz.applicationInadvanceInvoice
         },
         {
-            apiName:"提前开发票回显",
+            apiName:"开发票回显",
             subUrl:'/order/inadvanceinfo',
             param:[
                 {key:"id", type:"String", desc:"会员缴费列表返回id"}