no message

src/biz/member/examine.ts

@@ -2,7 +2,7 @@
  * 审批逻辑
  */
 
-import { INDIVIDUALMEMBERTYPE, MEMBERLEVEL, MEMBERTYPE, OPERATIONREHAVIOR, PAYMENTSTATUS, REGISTERFLOW, STATE, USERREGISTERSTATE } from "../../config/enum";
+import { INDIVIDUALMEMBERTYPE, MEMBERLEVEL, MEMBERTYPE, OPERATIONREHAVIOR, PAYMENTSTATUS, REGISTERFLOW, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../../config/enum";
 import { ERRORENUM } from "../../config/errorEnum";
 import { addManyData } from "../../data/add";
 import { TABLEENUM } from "../../data/models/model";
@@ -84,18 +84,22 @@ export async function adopt({userId}) {
         session:getEdition(thisYear, thisMonth),
         paymentStatus:PAYMENTSTATUS.未支付,
         lifespanStartTime:NowMs,
-        lifespanEndTime:NowMs + 1000
+        lifespanEndTime:NowMs + 1000,
+        memberLevel:MEMBERLEVEL.普通会员
     };
     let unitName = userInfo.unitName;
+    let subType = userInfo.unitMemberType;
     if (userInfo.memberType == MEMBERTYPE.个人会员) {
         addInfo.individualMemberType = INDIVIDUALMEMBERTYPE.个人会员;
         unitName = userInfo.name;
-    } 
+        subType = userInfo.individualMemberType;
+    }
 
     await updateOneData(TABLEENUM.用户表, {userId}, addInfo);
 
     //todo 创建一条初始订单
-    // createOrder(userId, unitName, NowMs, memberLv:, memberType:number, isFirst:boolean);
+    
+    await createOrder(userId, unitName, NowMs, MEMBERLEVEL.普通会员, userInfo.memberType, subType, true);
 
     /**提交审批历史信息 */
     let addApprovalHistory = {

src/biz/member/order.ts

@@ -2,7 +2,7 @@
  * 订单相关
  */
 import moment = require("moment");
-import { COSTTYPE, INVOICESTATUS, ISPAYENUM, MEMBERLEVEL, MEMBERTYPE, ORDERSTATE, PAYMENTSTATUS, PAYMENTTYPE, RECEIPTCONFIRMATION, STATE } from "../../config/enum";
+import { COSTTYPE, INDIVIDUALMEMBERTYPE, INVOICESTATUS, ISPAYENUM, MEMBERLEVEL, MEMBERTYPE, ORDERSTATE, PAYMENTSTATUS, PAYMENTTYPE, RECEIPTCONFIRMATION, STATE, UNITMEMBERTYPE } from "../../config/enum";
 import { generateOrderId, successResult } from "../../tools/system";
 import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
 import { addOneData } from "../../data/add";
@@ -21,19 +21,34 @@ import { updateOneData } from "../../data/update";
  * @param orderStartMs 订单开始时间
  * @param memberLv 会员等级 MEMBERLEVEL
  * @param memberType 会员类型 MEMBERTYPE
+ * @param subType 子类型 个人会员类型  或  单位会员类型 INDIVIDUALMEMBERTYPE 或 UNITMEMBERTYPE
  * @param isFirst 是否首次缴费
  * @returns 
  */
-export async function createOrder(userId:string, unitName:string, orderStartMs:number, memberLv:number, memberType:number, isFirst:boolean) {
+export async function createOrder(userId:string, unitName:string, orderStartMs:number, memberLv:number, memberType:number, subType:number, isFirst:boolean) {
     /**计算订单周期 */
     const EndMs = moment(orderStartMs).add(1, 'years').valueOf();
     /**订单id */
     const OrderId = generateOrderId(userId);
     /**计算会费 */
     let money = 0;
-    // if () {
+    if (memberType == MEMBERTYPE.个人会员) {
+        if (subType == INDIVIDUALMEMBERTYPE.个人会员) {
+            switch (memberLv) {
+                case MEMBERLEVEL.普通会员: money = 100; break;
+                case MEMBERLEVEL.理事: money = 200; break;
+                case MEMBERLEVEL.常务理事: money = 500; break;
+            }
+        } else money = -1;
+    } else {
+        switch (memberLv) {
+            case MEMBERLEVEL.普通会员: money = 1000; break;
+            case MEMBERLEVEL.理事: money = 2000; break;
+            case MEMBERLEVEL.常务理事: money = 5000; break;
+        }
+    }
+    if ( money == -1) return;//专家会员不会创建订单
 
-    // }
     let addInfo = {
         id:OrderId,
         orderCycleStart:orderStartMs,
@@ -49,11 +64,12 @@ export async function createOrder(userId:string, unitName:string, orderStartMs:n
         isFirst
     };
 
-    // await addOneData(TABLEENUM.订单表, addInfo);
+    await addOneData(TABLEENUM.订单表, addInfo);
     return true;
 }
 
 
+
 /**
  * 初始订单 success
  * 会员管理-待支付页