no message

src/biz/mail.ts

@@ -87,7 +87,7 @@ function getModel(name, type) {
             str = "您的会员服务已进入宽限期，为避免您的服务受到影响，请于30日内登录会员网站进行缴费处理。";
             title = "会员进入宽限期";   
         break;
-        case MAILTYPE.会员宽限期最后一天: 
+        case MAILTYPE.会员宽限期最后一天: //这里还没做
             str = "您的会员服务已到期，为避免您的服务受到影响，请及时登录会员网站进行缴费处理。";
             title = "服务到期"; 
         break;

src/biz/member/homePage.ts

@@ -113,10 +113,10 @@ export async function unitMemberUpdate({form, keyanForm, userId}) {
     const EccFuncName = '单位会员修改';
     eccEnumValue(EccFuncName, '单位信息类型', UNITMEMBERTYPE, form.unitMemberType);
 
-    /**确保邮箱的唯一性 */
-    let distinctMailInfo = await findOnce(TABLEENUM.用户表, {mail:form.unitMail}, ["userId"]);
-    if (distinctMailInfo && distinctMailInfo.userId && distinctMailInfo.userId != oldInfo.userId) throw new BizError(ERRORENUM.邮箱重复, oldInfo.loginId, oldInfo.mail );
-    form.mail = form.unitMail;
+    // /**确保邮箱的唯一性 */
+    // let distinctMailInfo = await findOnce(TABLEENUM.用户表, {mail:form.unitMail}, ["userId"]);
+    // if (distinctMailInfo && distinctMailInfo.userId && distinctMailInfo.userId != oldInfo.userId) throw new BizError(ERRORENUM.邮箱重复, oldInfo.loginId, oldInfo.mail );
+    // form.mail = form.unitMail;
     /**修改会员用户信息 */
     await updateOneData(TABLEENUM.用户表, {userId}, form);
 

src/biz/member/order.ts

@@ -198,7 +198,7 @@ export async function orderList({userId, type}) {
     const SelectFile = ["orderCycleStart", "orderCycleEnd", "money", "state", "id", "advanceInvoice", 
         "invoiceStatus", "unitName", "confirmReceipt", "newUscc", "isReceive", "isReplenishReturnInfo", 
         "refundSuccessful", "refundImgUrl", "isSueInvoicesInAdvance"];
-    let dbList = await find(TABLEENUM.订单表, findParam, SelectFile);
+    let dbList = await findToSort(TABLEENUM.订单表, findParam, {orderYear:-1}, SelectFile);
     /**查询证明函需要字段会员等级 */
     let myOldInfo = await findOnce(TABLEENUM.用户表, {userId}, ["memberLevel", "userId", "uscc", "memberType"]);
     if (!myOldInfo || !myOldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);

src/data/models/model.ts

@@ -578,7 +578,7 @@ const ModelArray = [
         schema:{
             readId:{type:'String', index:true},//消息已读id
             msgId:'String',//消息id
-            userId:'String',//用户id
+            userId:{type:'String', index:true},//用户id
             readTime:'Number',//阅读时间
             isRead:{type:'Number', default:STATE.否}//是否已读
         }

src/data/select.ts

@@ -41,8 +41,7 @@ export async function find(tableEnumValue:string, param, files?) {
 
 export async function findToSort(tableEnumValue:string, param, sortParam, files?) {
     files = files || [];
-    let data = await dataModels[tableEnumValue].find(param, files).sort(sortParam);
-    return data;
+    return await dataModels[tableEnumValue].find(param, files).sort(sortParam);
 }
 
 

src/routers/member/router.ts

@@ -931,22 +931,22 @@ export const Config = {
                     key:"form", type:"Object", sub:
                     {
                         /**基本信息 */
-                        unitName:{type:'String', desc:'单位名称'},
+                        // unitName:{type:'String', desc:'单位名称', notMustHave:true},s
                         addres:{type:'String', desc:'通信地址'},
-                        legalPerson:{type:'String', desc:'法人代表'},
-                        legalPersonPhone:{type:'String', desc:'法人联系电话'},
-                        legalPersonMail:{type:'String', desc:'法人邮箱'},
-                        unitMail:{type:'String', desc:'单位电子邮箱'},
+                        // legalPerson:{type:'String', desc:'法人代表', notMustHave:true},
+                        // legalPersonPhone:{type:'String', desc:'法人联系电话', notMustHave:true},
+                        // legalPersonMail:{type:'String', desc:'法人邮箱', notMustHave:true},
+                        // unitMail:{type:'String', desc:'单位电子邮箱', notMustHave:true},
                         contactPerson:{type:'String', desc:'日常联系人'},
                         contactPersonDuties:{type:'String', desc:'日常联系人职务'},
-                        contactPersonPhone:{type:'String', desc:'日常联系人电话'},
+                        // contactPersonPhone:{type:'String', desc:'日常联系人电话'},
                         sheng:{type:'String', desc:'省'},
                         shi:{type:'String', desc:'市'},
                         qu:{type:'String', desc:'区'},
-                        uusinessLicenseUrl:{type:'String', desc:'营业执照'},
+                        // uusinessLicenseUrl:{type:'String', desc:'营业执照', notMustHave:true},
                         /**单位信息 */
-                        unitMemberType:{type:'Number', desc:'单位类型'},
-                        yuanXiaoBanXueLeiXing:{type:'Number', desc:'办学类型'},
+                        // unitMemberType:{type:'Number', desc:'单位类型'},
+                        // yuanXiaoBanXueLeiXing:{type:'Number', desc:'办学类型'},
                         yuanXiaoZhuGuanBuMen:{type:'String', desc:'主管部门'},
                         yuanXiaoFuZeRen:{type:'String', desc:'主要负责人姓名'},
                         yuanXiaoFuZeRenZhiWu:{type:'String', desc:'主要负责人职位'},