no message

src/biz/member/examine.ts

@@ -2,7 +2,7 @@
  * 审批逻辑
  */
 
-import { MEMBERLEVEL, MEMBERTYPE, OPERATIONREHAVIOR, PAYMENTSTATUS, REGISTERFLOW, STATE, USERREGISTERSTATE } from "../../config/enum";
+import { INDIVIDUALMEMBERTYPE, MEMBERLEVEL, MEMBERTYPE, OPERATIONREHAVIOR, PAYMENTSTATUS, REGISTERFLOW, STATE, USERREGISTERSTATE } from "../../config/enum";
 import { ERRORENUM } from "../../config/errorEnum";
 import { addManyData } from "../../data/add";
 import { TABLEENUM } from "../../data/models/model";
@@ -77,19 +77,25 @@ export async function adopt({userId}) {
     const NowMs = thisDate.valueOf();
     const thisYear = thisDate.getFullYear();
     const thisMonth = thisDate.getMonth() + 1;
-    let addInfo = {
+    let addInfo:any = {
         auditTime:NowMs,
         joinTime:NowMs,
         userRegisterState:USERREGISTERSTATE.通过,
-        //todo 需要确认这里有没有默认有效时间
         session:getEdition(thisYear, thisMonth),
-        paymentStatus:PAYMENTSTATUS.未支付
+        paymentStatus:PAYMENTSTATUS.未支付,
+        lifespanStartTime:NowMs,
+        lifespanEndTime:NowMs + 1000
     };
+    let unitName = userInfo.unitName;
+    if (userInfo.memberType == MEMBERTYPE.个人会员) {
+        addInfo.individualMemberType = INDIVIDUALMEMBERTYPE.个人会员;
+        unitName = userInfo.name;
+    } 
+
     await updateOneData(TABLEENUM.用户表, {userId}, addInfo);
 
     //todo 创建一条初始订单
-    // unitName
-    // createOrder(userId, unitName:string, orderStartMs:number, memberLv:number, memberType:number, isFirst:boolean);
+    // createOrder(userId, unitName, NowMs, memberLv:, memberType:number, isFirst:boolean);
 
     /**提交审批历史信息 */
     let addApprovalHistory = {

src/biz/member/order.ts

@@ -31,11 +31,9 @@ export async function createOrder(userId:string, unitName:string, orderStartMs:n
     const OrderId = generateOrderId(userId);
     /**计算会费 */
     let money = 0;
-    if (memberLv == MEMBERLEVEL.专家会员) {
+    // if () {
 
-    } else {
-
-    }
+    // }
     let addInfo = {
         id:OrderId,
         orderCycleStart:orderStartMs,

src/data/models/model.ts

@@ -351,6 +351,7 @@ const ModelArray = [
             userRegisterState:{type:'Number', default:USERREGISTERSTATE.待审核},//用户注册状态 枚举USERREGISTERSTATE
             memberState:{type:'Number', default:MEMBERSTATE.正常},//会员状态 枚举MEMBERSTATE
             certificateType:'Number',//证书类型 枚举CERTIFICATETYPE
+            individualMemberType:{type: 'Number'},//个人会员类型 枚举INDIVIDUALMEMBERTYPE
             /**宽限期状态 */
             isGracePeriod:{type:'Number', default:0},//是否宽限期 0：否， 1：是
             gracePeriodEndTime:'Number',//宽限期到期时间 时间戳
@@ -381,7 +382,6 @@ const ModelArray = [
             profAchievement:'String',//专业成果
             otherEMP:'String',//其他任职情况
             otherPROF:'String',//其他专业情况
-            individualMemberType:{type: 'Number'},//个人会员类型 枚举INDIVIDUALMEMBERTYPE
             profCategory:'Number',//专业类别 枚举PROFCATEGORY
             /**第二步流程表单（个人）【其他附件】 */
             cardUrl:{type:'[String]', default:[]},//身份证正反面图片地址