no message

src/biz/member/cost.ts

@@ -51,8 +51,7 @@ export async function placeAnOrder({id}) {
         description:desc,
         out_trade_no,//订单号
         amount:{//金额
-            // total:orderInfo.money
-            total:1//单位分  金额要乘100
+            total:orderInfo.money * 100 //微信支付的单位是分  金额要乘100
         },
         notify_url:'https://yydata.mynatapp.cc/pay/wechart/callback',//订单回调
     };
@@ -154,8 +153,11 @@ export async function payCallback(body) {
                 updateUserInfo.gracePeriodEndTime = 0;
                 updateUserInfo.memberState = MEMBERSTATE.正常;
                 updateUserInfo.paymentStatus = PAYMENTSTATUS.已支付;
-                
+            } else {//非一笔订单 要更新会员到期时间 到 用户表
+                updateUserInfo.lifespanStartTime = oldInfo.orderCycleStart;
+                updateUserInfo.lifespanEndTime = oldInfo.orderCycleEnd;
             }
+
             if (oldInfo.isFirst) {
                 updateUserInfo.isFirstPay = true;
             }

src/biz/member/homePage.ts

@@ -108,6 +108,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;
     /**修改会员用户信息 */
     await updateOneData(TABLEENUM.用户表, {userId}, form);
 

src/biz/member/member.ts

@@ -144,9 +144,17 @@ export async function unitMemberUpdate({form, keyanForm, id}) {
 
     /**校验枚举 */
     const EccFuncName = '单位会员修改';
-    eccEnumValue(EccFuncName, '单位信息类型', UNITMEMBERTYPE, form.unitMemberType);
+     /**校验入参 */
+     eccCityCode(form.sheng, form.shi, form.qu);
+     eccEnumValue(EccFuncName, '性别', SEX, form.sex);
+     eccEnumValue(EccFuncName, '证件类型', DOCUMENTTYPE, form.documentType);
+     eccEnumValue(EccFuncName, '民族', NATION, form.nation);
+     eccEnumValue(EccFuncName, '专业类别', PROFCATEGORY, form.profCategory);
     
     /**修改会员用户信息 */
+    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:id}, form);
 
     /**删除对应userId科研成果 */

src/biz/member/order.ts

@@ -221,6 +221,9 @@ export async function confirmReceiptPass({id}) {
         updateUserInfo.gracePeriodEndTime = 0,
         updateUserInfo.memberState = MEMBERSTATE.正常,
         updateUserInfo.paymentStatus = PAYMENTSTATUS.已支付
+    } else {//非一笔订单 要更新会员到期时间 到 用户表
+        updateUserInfo.lifespanStartTime = orderInfo.orderCycleStart;
+        updateUserInfo.lifespanEndTime = orderInfo.orderCycleEnd;
     }
     if (orderInfo.isFirst) {
         updateUserInfo.isFirstPay = true;

src/biz/register.ts

@@ -151,7 +151,8 @@ export async function memberRegister2({form, id}) {
         mail,
         pwd,
         phone,
-        token
+        token,
+        unitMail:mail,
     };
     await addOneData(TABLEENUM.用户表, addInfo);
 

src/data/models/model.ts

@@ -356,7 +356,7 @@ const ModelArray = [
             registerFlow:{type:'Number', default:REGISTERFLOW.未注册},//会员注册流程 枚举
             isAdmin:{ type:'Number', index:true, default:STATE.否},//是否是管理员
             userRegisterState:{type:'Number', default:USERREGISTERSTATE.待审核},//用户注册状态 枚举USERREGISTERSTATE
-            memberState:{type:'Number', default:MEMBERSTATE.正常},//会员状态 枚举 MEMBERSTATE
+            memberState:{type:'Number', default:MEMBERSTATE.异常},//会员状态 枚举 MEMBERSTATE
             certificateType:'Number',//证书类型 枚举CERTIFICATETYPE
             individualMemberType:{type: 'Number'},//个人会员类型 枚举INDIVIDUALMEMBERTYPE
             memberLevel:{type:'Number', default:MEMBERLEVEL.普通会员},//会员等级、职务 枚举 MEMBERLEVEL 【会员管理用】

src/routers/member/router.ts

@@ -82,7 +82,7 @@ export const Config = {
                     key:"form", type:"Object", sub:
                     {
                         loginId:{type:'String', desc:'用户名', notMustHave:false},
-                        mail:{type:'String', desc:'邮箱', notMustHave:false},
+                        mail:{type:'String', desc:'单位邮箱', notMustHave:false},//2024.4.22日的需求 由邮箱改成单位邮箱
                         pwd:{type:'String', desc:'密码', notMustHave:false},
                         confirmation:{type:'String', desc:'确认密码', notMustHave:false},
                         phone:{type:'String', desc:'联系人手机号', notMustHave:false},
@@ -109,7 +109,7 @@ export const Config = {
                         legalPerson:{type:'String', desc:'法人代表', notMustHave:false},
                         legalPersonPhone:{type:'String', desc:'法人联系电话', notMustHave:false},
                         legalPersonMail:{type:'String', desc:'法人邮箱', notMustHave:false},
-                        // unitMail:{type:'String', desc:'单位电子邮箱', notMustHave:false},
+                        // unitMail:{type:'String', desc:'单位电子邮箱', notMustHave:false},  2024.4.22日的需求 去掉
                         contactPerson:{type:'String', desc:'日常联系人', notMustHave:false},
                         contactPersonDuties:{type:'String', desc:'日常联系人职务', notMustHave:false},
                         contactPersonPhone:{type:'String', desc:'日常联系人手机', notMustHave:false},
@@ -127,8 +127,8 @@ export const Config = {
                         yuanXiaoKeYanFuZeRen:{type:'String', desc:'院校科研负责人', notMustHave:false},
                         yuanXiaoKeYanFuZeRenDianHua:{type:'String', desc:'院校科研负责人电话', notMustHave:false},
                         jiaoXueFuZeRenXinMing:{type:'String', desc:'教学负责人姓名', notMustHave:false},
-                        yuanXiaoXueShengZongRenShu:{type:'Number', desc:'院校学生总人数', notMustHave:false},
-                        yuanXiaoJiaoZhiGongZongRenShu:{type:'Number', desc:'院校教职工总人数', notMustHave:false},
+                        yuanXiaoXueShengZongRenShu:{type:'Number', desc:'院校学生总人数', notMustHave:true},
+                        yuanXiaoJiaoZhiGongZongRenShu:{type:'Number', desc:'院校教职工总人数', notMustHave:true},
                         jiaoXueFuZeRenDianHua:{type:'String', desc:'教学负责人电话', notMustHave:false},
                         kaishezhuanYe:{type:'String', desc:'开设专业', notMustHave:true},
                         danWeiJianJie:{type:'String', desc:'单位简介', notMustHave:true},