no message

src/biz/member/examine.ts

@@ -161,6 +161,7 @@ export async function adopt({id, session}) {
     let memberNum = getMenberNum(thisDate, userInfo.sheng, userCount, userInfo.memberType);
 
     let joinTime = 0;
+    let orderTimeMs = 0;
     let sessionDate = getSessionByEdition(Math.floor(session/100),Math.floor(session%100));
     if (sessionDate) {
         joinTime = sessionDate.timeMs;
@@ -187,7 +188,7 @@ export async function adopt({id, session}) {
     }
 
     //创建初始订单
-    await createOrder(id, userInfo.loginId, userInfo.phone, unitName, NowMs + 1000, MEMBERLEVEL.普通会员, userInfo.memberType, subType, true);
+    await createOrder(id, userInfo.loginId, userInfo.phone, unitName, joinTime + 1000, MEMBERLEVEL.普通会员, userInfo.memberType, subType, true);
 
     await updateOneData(TABLEENUM.用户表, {userId:id}, updateInfo);
 

src/biz/member/order.ts

@@ -13,6 +13,8 @@ import { BizError } from "../../util/bizError";
 import { ERRORENUM } from "../../config/errorEnum";
 import { updateOneData } from "../../data/update";
 
+// db.getCollection('orders').insertOne({ "paymentNum" : "", "offlinePaymentUrl" : "", "weChartPR" : "", "weChartState" : 0, "isFirst" : true, "firstPayExamine" : false, "confirmReceipt" : 0, "confirmReceiptMs" : 0, "invoiceStatus" : 1, "advanceInvoice" : false, "isReceive" : 0, "isReplenishReturnInfo" : false, "refundSuccessful" : false, "isSueInvoicesInAdvance" : false, "id" : "3f9b9936f12ed619f11458ac46ff3835", "orderCycleStart" : 1498262400100.0, "orderCycleEnd" : 1529798400100.0, "unitName" : "西安市艺术学校", "money" : 2000, "paymentMethod" : 0, "userId" : "f2bed663f23c43b751876be9eae93334", "loginId" : "西安市艺术学校1960", "memberCategory" : 2, "invoiceAdd" : "", "state" : 2, "phone" : "13991991926", "ct" : 1734334302795})
+
 
 /**
  * 对内使用  创建一条订单
@@ -476,7 +478,7 @@ export async function billStateList({name, memberType, documentId, phone, mail,
         itemData.memberState = changeEnumValue(MEMBERSTATE, userInfomation.memberState);
         // itemData.cycle = `${moment(info.orderCycleStart).format("YYYY-MM-DD")}至${moment(info.orderCycleEnd).format("YYYY-MM-DD")}`;
         itemData.cycle = `${moment(info.orderCycleStart).format("YYYY")}至${moment(info.orderCycleEnd).format("YYYY")}`;
-        itemData.weChartCreatePayMs = moment(info.weChartCreatePayMs).format("YYYY-MM-DD");
+        itemData.weChartCreatePayMs = moment(info.weChartCreatePayMs || info.payTime).format("YYYY-MM-DD");
         itemData.name = userInfomation.name;
         dataList.push(itemData);
     }

src/biz/member/user.ts

@@ -109,7 +109,7 @@ export async function changePwd({userId, phone, pwd, confirmation, code}) {
             throw new BizError(ERRORENUM.账号不存在)
         }
         let checkUserInfo = await findOnce(TABLEENUM.用户表, {phone}, ["userId"]);
-        if (checkUserInfo && checkUserInfo.userId) throw new BizError(ERRORENUM.该手机号已被注册);
+        if (checkUserInfo && checkUserInfo.userId && checkUserInfo.userId != userInfo.userId) throw new BizError(ERRORENUM.该手机号已被注册);
         if (!userInfo.isInput ) {
             throw new BizError(ERRORENUM.密码修改错误);
         }else if ((userInfo.inputUserChangePwd == true) && (userInfo.memberType == MEMBERTYPE.单位会员 && userInfo.unitMemberType == UNITMEMBERTYPE.院校)) {

src/data/models/model.ts

@@ -435,7 +435,7 @@ const ModelArray = [
             yuanXiaoXueShengZongRenShu:'Number',//院校学生总人数
             yuanXiaoJiaoZhiGongZongRenShu:'Number',//教职工总人数
             jiaoXueFuZeRenDianHua:'String',//教学负责人电话
-            kaishezhuanYe:'String',//开设专业 2024.04.22修改
+            kaishezhuanYe:'String',//开设专业 2024.04.22修改 
             danWeiJianJie:'String',//单位简介 2024.04.22修改
             /**第三步流程表单（单位）【申请表上传】 */
             applicationForm:'String',//入会申请表

src/main.ts

 
+import moment = require("moment");
 import { initActivity } from "./biz/member/msgActivity";
+import { createOrder } from "./biz/member/order";
 import { initAdmin } from "./biz/member/rightsMgmt";
 import { t } from "./biz/provide";
 import { initSaveUnsubmitted } from "./biz/register";
@@ -28,6 +30,7 @@ async function lanuch() {
     // await inputData();  20240520日导入数据
     // await t();
     // await test();
+    // console.log(moment(1498262400000).format("YYYY-MM-DD HH:mm:SS"))
     console.log("服务初始化成功");
     
 }