no message

src/biz/member/cost.ts

@@ -31,9 +31,9 @@ const pay = new WxPay({
  * @returns 
  */
 export async function placeAnOrder({id}) {
-    let orderInfo = await findOnce(TABLEENUM.订单表, {id}, ["id", "loginId", "userId", "memberCategory", "money", "orderCycleStart", "orderCycleEnd","weChartState", "state", "weChartCreatePayMs", "weChartPayUrl", "weChartPR"]);
+    let orderInfo = await findOnce(TABLEENUM.订单表, {id}, ["id", "loginId", "userId", "memberCategory", "money", "orderCycleStart", "orderCycleEnd","weChartState", "state", "weChartCreatePayMs", "weChartPayUrl", "weChartPR", "confirmReceipt"]);
     if (!orderInfo || !orderInfo.id) throw new BizError(ERRORENUM.订单不存在);
-    if (orderInfo.state == ORDERSTATE.已支付) throw new BizError(ERRORENUM.该订单已支付);
+    if (orderInfo.state == ORDERSTATE.已支付 && orderInfo.confirmReceipt != RECEIPTCONFIRMATION.退回) throw new BizError(ERRORENUM.该订单已支付);
     if (orderInfo.weChartCreatePayMs && orderInfo.weChartState == WEICHARTPAYSTATE.未支付) {
         if (new Date(orderInfo.weChartCreatePayMs).valueOf() < (new Date().valueOf() + (15 * 60 * 1000)) ) {
             return {code_url:orderInfo.weChartPayUrl, weChartPR:orderInfo.weChartPR};
@@ -62,7 +62,7 @@ export async function placeAnOrder({id}) {
     let updateInfo = {
         weChartCreatePayMs:new Date().valueOf(),
         weChartPR:out_trade_no, paymentMethod:PAYMENTTYPE.微信支付, weChartState:WEICHARTPAYSTATE.未支付,
-        weChartPayUrl:code_url
+        weChartPayUrl:code_url,
     };
     await updateOneData(TABLEENUM.订单表, {id}, updateInfo );
     return {code_url, weChartPR:out_trade_no};
@@ -77,13 +77,13 @@ async function close(id:string) {
  * 订单查询状态【前端调用】
  */
 export async function orderState({id, weChartPR}) {
-    let orderInfo = await findOnce(TABLEENUM.订单表, {id, weChartPR}, ["id", "state", "weChartCreatePayMs", "weChartState"]);
+    let orderInfo = await findOnce(TABLEENUM.订单表, {id, weChartPR}, ["id", "state", "weChartCreatePayMs", "weChartState", "confirmReceipt"]);
     if (!orderInfo || !orderInfo.id) throw new BizError(ERRORENUM.订单不存在);
-    if (orderInfo.state == ORDERSTATE.已支付) {
+    if (orderInfo.state == ORDERSTATE.已支付 && orderInfo.confirmReceipt != RECEIPTCONFIRMATION.退回) {
         return {state:WEICHARTPAYSTATE.已支付, msg:"已支付"};//已支付
     }
     if (orderInfo.weChartState == WEICHARTPAYSTATE.未支付) {
-        if (!orderInfo.weChartCreatePayMs) return {state:WEICHARTPAYSTATE.未提交, msg:"订单未提交"};
+        if (!orderInfo.weChartCreatePayMs) return {state:WEICHARTPAYSTATE.未提交, msg:"订单未提交"}; 
         if ( (new Date(orderInfo.weChartCreatePayMs).valueOf() +  (15 * 60 * 1000)) > new Date().valueOf() ) {
             const weChartResult = await pay.query({out_trade_no: weChartPR});
             if (weChartResult.status != 200 && weChartResult.status != 204 ) throw new BizError(ERRORENUM.查看微信支付状态失败);
@@ -137,29 +137,29 @@ export async function payCallback(body) {
                 state:ORDERSTATE.已支付,
                 paymentMethod:PAYMENTTYPE.微信支付,
                 payTime:new Date().valueOf(),
-                weChartState:WEICHARTPAYSTATE.已支付
+                weChartState:WEICHARTPAYSTATE.已支付,
             };
             if (!oldInfo.isFirst) updateInfo.confirmReceipt = RECEIPTCONFIRMATION.待确认;
 
             await updateOneData(TABLEENUM.订单表, {weChartPR:wechartCallbackData.out_trade_no}, updateInfo);
 
             /**只有一笔欠费时才更新用户状态 */
-            if (notPayCount <= 1) {
+            let updateUserInfo:any = {};
+            if (notPayCount < 1) {
                 let newOrderInfo = await findOnceToSort(TABLEENUM.订单表, {userId:oldInfo.userId}, {lifespanEndTime:-1}, ["orderCycleStart","orderCycleEnd"]);
-                let updateUserInfo:any = {
-                    lifespanStartTime:newOrderInfo.orderCycleStart,
-                    lifespanEndTime:newOrderInfo.orderCycleEnd,
-                    isGracePeriod:STATE.否,
-                    gracePeriodEndTime:0,
-                    memberState:MEMBERSTATE.正常,
-                    paymentStatus:PAYMENTSTATUS.已支付
-                   
-                };
-                if (oldInfo.isFirst) {
-                    updateUserInfo.isFirstPay = true;
-                }
-                await updateOneData(TABLEENUM.用户表, {userId:oldInfo.userId}, updateUserInfo);
+                
+                updateUserInfo.lifespanStartTime = newOrderInfo.orderCycleStart;
+                updateUserInfo.lifespanEndTime = newOrderInfo.orderCycleEnd;
+                updateUserInfo.isGracePeriod = STATE.否;
+                updateUserInfo.gracePeriodEndTime = 0;
+                updateUserInfo.memberState = MEMBERSTATE.正常;
+                updateUserInfo.paymentStatus = PAYMENTSTATUS.已支付;
+                
             }
+            if (oldInfo.isFirst) {
+                updateUserInfo.isFirstPay = true;
+            }
+            if (Object.keys(updateUserInfo).length) await updateOneData(TABLEENUM.用户表, {userId:oldInfo.userId}, updateUserInfo);
 
             return {
                 code:"SUCCESS",

src/biz/member/examine.ts

@@ -3,7 +3,7 @@
  */
 
 import moment = require("moment");
-import { INDIVIDUALMEMBERTYPE, MEMBERLEVEL, MEMBERTYPE, OPERATIONREHAVIOR, PAYMENTSTATUS, REGISTERFLOW, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../../config/enum";
+import { INDIVIDUALMEMBERTYPE, MEMBERLEVEL, MEMBERSTATE, 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";
@@ -105,6 +105,7 @@ export async function adopt({id, session}) {
         lifespanStartTime:NowMs,
         lifespanEndTime:NowMs + 1000,
         memberLevel:MEMBERLEVEL.普通会员,
+        memberState:MEMBERSTATE.异常,
         memberNum
     };
     let unitName = userInfo.unitName;

src/biz/member/homePage.ts

@@ -36,7 +36,7 @@ export async function getMemberData({userId}) {
     /**判断会员类型，个人会员与单位会员返回不同字段 */
     if (oldInfo.memberType == MEMBERTYPE.单位会员) {
         baseSelectFiles = ["userId", "unitName", "uscc", "legalPerson", "legalPersonPhone", "legalPersonMail", "unitMail", "contactPerson", 
-        "contactPersonDuties", "contactPersonPhone", "uusinessLicenseUrl", "addres", "sheng", "shi", "qu"];
+        "contactPersonDuties", "contactPersonPhone", "uusinessLicenseUrl", "addres", "sheng", "shi", "qu", "kaishezhuanYe", "danWeiJianJie"];
         majorSelectFiles = ["unitMemberType", "yuanXiaoBanXueLeiXing", "yuanXiaoZhuGuanBuMen", "yuanXiaoFuZeRen", "yuanXiaoFuZeRenZhiWu", 
         "yuanXiaoFuZeRenDianHua", "yuanXiaoBanGongFuZeRen", "yuanXiaoBanGongFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang", "yuanXiaoKeYanFuZeRen", 
         "yuanXiaoKeYanFuZeRenDianHua", "jiaoXueFuZeRenXinMing", "jiaoXueFuZeRenDianHua"];
@@ -245,7 +245,7 @@ export async function getSheng ({userId}) {
     let userInfo = await findOnce(TABLEENUM.用户表, {userId}, Files);
     if (!userInfo || !userInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
 
-    let certificate = false;
+    let certificate = false;//是否可以下载
     let cefaInfo = {};
     let msg = '会员注册尚未审核通过，无法下载证书';
     //判断是否审批通过
@@ -271,7 +271,7 @@ export async function getSheng ({userId}) {
             //院校无需支付可下载
             if (userInfo.unitMemberType == UNITMEMBERTYPE.院校) certificate = true;
             //机构和其他已支付可下载
-            if (userInfo.unitMemberType == UNITMEMBERTYPE.机构 || userInfo.unitMemberType == UNITMEMBERTYPE.其他 && userInfo.paymentStatus != PAYMENTSTATUS.未支付) {
+            else if (userInfo.paymentStatus != PAYMENTSTATUS.未支付) {
                 certificate = true;
             }
             if (certificate) {

src/biz/member/member.ts

@@ -2,7 +2,7 @@
  * 会员管理逻辑
  */
 
-import { MEMBERSTATE, MEMBERLEVEL, DOCUMENTTYPE, NATION, PROFCATEGORY, MEMBERTYPE, USERREGISTERSTATE, STATE, UNITMEMBERTYPE, ADMINLV, ADMINTYPE } from "../../config/enum";
+import { MEMBERSTATE, MEMBERLEVEL, DOCUMENTTYPE, NATION, PROFCATEGORY, MEMBERTYPE, USERREGISTERSTATE, STATE, UNITMEMBERTYPE, ADMINLV, ADMINTYPE, SEX } from "../../config/enum";
 import { ERRORENUM } from "../../config/errorEnum";
 import { TABLEENUM } from "../../data/models/model";
 import { find, findCount, findOnce, findOnceToSort, findToPage, findToSort } from "../../data/select";
@@ -14,7 +14,7 @@ import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
 import { addManyData, addOneData } from "../../data/add";
 import { deleteManyData, deleteOneData } from "../../data/delete";
 import moment = require("moment");
-import { getCityNameByCode } from "../../config/cityConfig";
+import { eccCityCode, getCityNameByCode } from "../../config/cityConfig";
 import { eccFormParam } from "../../util/verificationParam";
 
 
@@ -44,6 +44,7 @@ export async function unitMemberList({unitName, joinTime, unitMemberType, member
     if (qu) selectParam.qu = qu;
     selectParam.memberType = MEMBERTYPE.单位会员;
     selectParam.userRegisterState = USERREGISTERSTATE.通过;
+    selectParam.isFirstPay = true;
 
     const SelectFiles = ["userId", "memberState", "unitName", "loginId", "phone", "joinTime", "unitMemberLevel", "sheng", "shi", "qu"];
     let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber);
@@ -81,7 +82,7 @@ const UnitBasicConfig = ["userId", "unitName", "uscc", "legalPerson", "legalPers
 "uusinessLicenseUrl", "addres", "sheng", "shi", "qu", "applicationForm"];
 const UnitConfig = ["unitMemberType", "yuanXiaoBanXueLeiXing", "yuanXiaoZhuGuanBuMen", "yuanXiaoFuZeRen", "yuanXiaoFuZeRenZhiWu", "yuanXiaoFuZeRenDianHua", 
 "yuanXiaoBanGongFuZeRen", "yuanXiaoBanGongFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang", "yuanXiaoKeYanFuZeRen", "yuanXiaoKeYanFuZeRenDianHua",
-"jiaoXueFuZeRenXinMing", "jiaoXueFuZeRenDianHua"];
+"jiaoXueFuZeRenXinMing", "jiaoXueFuZeRenDianHua", "kaishezhuanYe", "danWeiJianJie"];
 
 export async function unitMemberDetails({id}) {
     let oldInfo = await findOnce(TABLEENUM.用户表, {userId:id});
@@ -203,6 +204,7 @@ export async function individualMemberList({name, documentId, phone, individualM
     if (memberState) selectParam.memberState = memberState;
     selectParam.memberType = MEMBERTYPE.个人会员;
     selectParam.userRegisterState = USERREGISTERSTATE.通过;
+    selectParam.isFirstPay = true;
 
     let selectConf = ["userId", "memberState", "unitName", "name", "sex", "nation", "loginId", "phone", "joinTime", "memberLevel", "sheng", "shi", "qu"];
     let dbList = await findToPage(TABLEENUM.用户表, selectParam, selectConf, pageNumber);
@@ -278,6 +280,14 @@ export async function individualMemberDetails({id}) {
  export async function individualMemberUpdate({form, id}) {
     let oldInfo = await findOnce(TABLEENUM.用户表, {userId:id});
     if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
+
+    /**校验入参 */
+    eccCityCode(form.sheng, form.shi, form.qu);
+    let EccFuncName = "个人会员修改";
+    eccEnumValue(EccFuncName, '性别', SEX, form.sex);
+    eccEnumValue(EccFuncName, '证件类型', DOCUMENTTYPE, form.documentType);
+    eccEnumValue(EccFuncName, '民族', NATION, form.nation);
+    eccEnumValue(EccFuncName, '专业类别', PROFCATEGORY, form.profCategory);
     await updateOneData(TABLEENUM.用户表, {userId:id}, form);
 
     return successResult();

src/biz/member/memberFees.ts

@@ -3,7 +3,7 @@
  */
 
 import moment = require("moment");
-import { MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, ORDERSTATE, PAYMENTSTATUS, PAYMENTTYPE, STATE, USERREGISTERSTATE } from "../../config/enum";
+import { MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, ORDERSTATE, PAYMENTSTATUS, PAYMENTTYPE, RECEIPTCONFIRMATION, STATE, USERREGISTERSTATE } from "../../config/enum";
 import { TABLEENUM } from "../../data/models/model";
 import { find, findCount, findOnce, findOnceToSort, findToPage, findToSort } from "../../data/select";
 import { extractData } from "../../util/piecemeal";
@@ -188,41 +188,24 @@ export async function getRenewalPeriod({unitName, joinStartTime, joinEndTime, me
 
 
 /**
- * 线下付款 success
+ * 线下付款 会费管理 success
  * @param param0 
  */
 export async function offlinePayment({orderId, paymentNum, offlinePaymentUrl }) {
     let orderInfo = await findOnce(TABLEENUM.订单表, {id:orderId});
     if (!orderInfo || !orderInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
-    if (orderInfo.state == ORDERSTATE.已支付) throw new BizError(ERRORENUM.该订单已支付);
-    let notPayCount = await findCount(TABLEENUM.订单表, {userId:orderInfo.userId, state:ORDERSTATE.未支付} );
+    if (orderInfo.state == ORDERSTATE.已支付 && orderInfo.confirmReceipt != RECEIPTCONFIRMATION.退回) throw new BizError(ERRORENUM.该订单已支付);
 
     let updateInfo = {
         paymentNum,
         offlinePaymentUrl,
         state:ORDERSTATE.已支付,
         paymentMethod:PAYMENTTYPE.线下支付,
-        payTime:new Date().valueOf()
+        payTime:new Date().valueOf(),
+        confirmReceipt:RECEIPTCONFIRMATION.待确认
     };
 
     await updateOneData(TABLEENUM.订单表, {id:orderId}, updateInfo);
-   
-    /**只有一笔欠费时才更新用户状态 */
-    if (notPayCount <= 1) {
-        let newOrderInfo = await findOnceToSort(TABLEENUM.订单表, {userId:orderInfo.userId}, {lifespanEndTime:-1}, ["lifespanStartTime","lifespanEndTime"]);
-        let updateUserInfo:any = {
-            lifespanStartTime:newOrderInfo.lifespanStartTime,
-            lifespanEndTime:newOrderInfo.lifespanEndTime,
-            isGracePeriod:STATE.否,
-            gracePeriodEndTime:0,
-            memberState:MEMBERSTATE.正常,
-            paymentStatus:PAYMENTSTATUS.已支付
-        };
-        if (orderInfo.isFirst) {
-            updateUserInfo.isFirstPay = true;
-        }
-        await updateOneData(TABLEENUM.用户表, {userId:orderInfo.userId}, updateUserInfo);
-    }
 
     return successResult();
 }

src/biz/member/order.ts

@@ -12,7 +12,6 @@ import { extractData } from "../../util/piecemeal";
 import { BizError } from "../../util/bizError";
 import { ERRORENUM } from "../../config/errorEnum";
 import { updateOneData } from "../../data/update";
-import { info } from "console";
 
 
 /**
@@ -84,11 +83,11 @@ export async function firstOrderList({unitName, joinTime, memberType, orderState
     if (unitName) findParam.unitName = {"$regex":unitName};
     if (memberType) findParam.memberCategory = memberType;
     if (orderState) findParam.state = orderState;
-    let selectFile = ["id", "unitName", "loginId", "phone", "orderCycleStart", "orderCycleEnd", "memberCategory", "state"];
+    let selectFile = ["id", "unitName", "loginId", "phone", "orderCycleStart", "orderCycleEnd", "memberCategory", "state", "userId"];
     let dbList = await findToPage(TABLEENUM.订单表, findParam, selectFile, pageNumber);
     let dataCount = await findCount(TABLEENUM.订单表, findParam);
     let dataList = [];
-    let itemFile = ["id", "unitName", "loginId", "phone", "memberCategory"];
+    let itemFile = ["id", "unitName", "loginId", "phone", "memberCategory", "userId"];
     dbList.forEach(info =>  { 
         let itemData:any = extractData(info, itemFile);
         itemData.joinTime = moment(info.orderCycleStart).format("YYYY-MM-DD");
@@ -104,7 +103,7 @@ export async function firstOrderList({unitName, joinTime, memberType, orderState
         dataList.push(itemData);
     });
 
-    return {dataList, dataCount}
+    return {dataList, dataCount};
 }
 
 
@@ -131,35 +130,18 @@ export async function checkOrder({id}) {
 export async function offlinePayment({orderId, paymentNum, offlinePaymentUrl }) {
     let orderInfo = await findOnce(TABLEENUM.订单表, {id:orderId});
     if (!orderInfo || !orderInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
-    if (orderInfo.state == ORDERSTATE.已支付) throw new BizError(ERRORENUM.该订单已支付);
-    let notPayCount = await findCount(TABLEENUM.订单表, {userId:orderInfo.userId, state:ORDERSTATE.未支付} );
+    if (orderInfo.state == ORDERSTATE.已支付 && orderInfo.confirmReceipt != RECEIPTCONFIRMATION.退回) throw new BizError(ERRORENUM.该订单已支付);
 
     let updateInfo = {
         paymentNum,
         offlinePaymentUrl,
         state:ORDERSTATE.已支付,
         paymentMethod:PAYMENTTYPE.线下支付,
-        payTime:new Date().valueOf()
+        payTime:new Date().valueOf(),
+        confirmReceipt:RECEIPTCONFIRMATION.待确认
     };
 
     await updateOneData(TABLEENUM.订单表, {id:orderId}, updateInfo);
-   
-    /**只有一笔欠费时才更新用户状态 */
-    if (notPayCount <= 1) {
-        let newOrderInfo = await findOnceToSort(TABLEENUM.订单表, {userId:orderInfo.userId}, {lifespanEndTime:-1}, ["orderCycleStart","orderCycleEnd"]);
-        let updateUserInfo:any = {
-            lifespanStartTime:newOrderInfo.orderCycleStart,
-            lifespanEndTime:newOrderInfo.orderCycleEnd,
-            isGracePeriod:STATE.否,
-            gracePeriodEndTime:0,
-            memberState:MEMBERSTATE.正常,
-            paymentStatus:PAYMENTSTATUS.已支付
-        };
-        if (orderInfo.isFirst) {
-            updateUserInfo.isFirstPay = true;
-        }
-        await updateOneData(TABLEENUM.用户表, {userId:orderInfo.userId}, updateUserInfo);
-    }
 
     return successResult();
 }
@@ -227,6 +209,23 @@ export async function confirmReceiptPass({id}) {
     if (orderInfo.invoiceStatus != INVOICESTATUS.已开发票) updateInfo.invoiceStatus = INVOICESTATUS.未开发票;
     await updateOneData(TABLEENUM.订单表, {id}, updateInfo);
 
+    let notPayCount = await findCount(TABLEENUM.订单表, {userId:orderInfo.userId, state:ORDERSTATE.未支付} );
+    let updateUserInfo:any = {};
+    /**只有一笔欠费时才更新用户状态 */
+    if (notPayCount < 1) {
+        let newOrderInfo = await findOnceToSort(TABLEENUM.订单表, {userId:orderInfo.userId}, {lifespanEndTime:-1}, ["orderCycleStart","orderCycleEnd"]);
+        
+        updateUserInfo.lifespanStartTime = newOrderInfo.orderCycleStart,
+        updateUserInfo.lifespanEndTime = newOrderInfo.orderCycleEnd,
+        updateUserInfo.isGracePeriod = STATE.否,
+        updateUserInfo.gracePeriodEndTime = 0,
+        updateUserInfo.memberState = MEMBERSTATE.正常,
+        updateUserInfo.paymentStatus = PAYMENTSTATUS.已支付
+    }
+    if (orderInfo.isFirst) {
+        updateUserInfo.isFirstPay = true;
+    }
+    if (Object.keys(updateUserInfo).length) await updateOneData(TABLEENUM.用户表, {userId:orderInfo.userId}, updateUserInfo);
     return successResult();
 }
 
@@ -277,16 +276,18 @@ export async function billStateList({unitName, paymentType, isPay, pageNumber})
     let dataList = [];
 
     let itemFile = ["id", "userId", "unitName", "money", "paymentNum", "memberCategory", "state", "paymentMethod"];
-    dbList.forEach(info =>  {
+    for (let i= 0; i < dbList.length; i++) {
+        let info = dbList[i];
         let itemData:any = extractData(info, itemFile);
         itemData.joinTime = moment(info.orderCycleStart).format("YYYY-MM-DD");
         itemData.memberType = changeEnumValue(MEMBERTYPE, itemData.memberCategory);
         itemData.paymentMethod = changeEnumValue(PAYMENTTYPE, itemData.paymentMethod);
         itemData.isPay = changeEnumValue(ORDERSTATE, itemData.state);
-        itemData.memberState = "正常";//todo 后面要连接用户表
+        let userInfomation = await findOnce(TABLEENUM.用户表, {userId:itemData.userId}, ["userId", "memberState"]);
+        itemData.memberState = changeEnumValue(MEMBERSTATE, userInfomation.memberState);
         itemData.cycle = `${moment(info.orderCycleStart).format("YYYY-MM-DD")}至${moment(info.orderCycleEnd).format("YYYY-MM-DD")}`
         dataList.push(itemData);
-    });
+    }
 
     return {dataList, dataCount};
 }
@@ -541,17 +542,24 @@ export async function getInvoiceStatus({id}) {
 
 
 /**
- * 上传转账截图
+ * 上传转账截图   个人页面的线下付款
  * @param param0 
  */
- export async function upTransferImg({id, paymentNum, offlinePaymentUrl}) {
-    let oldInfo = await findOnce(TABLEENUM.订单表, {id});
-    if (!oldInfo || !oldInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
+ export async function upTransferImg({id, weChartPR, offlinePaymentUrl}) {
+
+    let orderInfo = await findOnce(TABLEENUM.订单表, {id});
+    if (!orderInfo || !orderInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
+    if (orderInfo.state == ORDERSTATE.已支付 && orderInfo.confirmReceipt != RECEIPTCONFIRMATION.退回) throw new BizError(ERRORENUM.该订单已支付);
+
+    let updateInfo = {
+        paymentNum:weChartPR,
+        offlinePaymentUrl,
+        state:ORDERSTATE.已支付,
+        paymentMethod:PAYMENTTYPE.线下支付,
+        payTime:new Date().valueOf(),
+        confirmReceipt:RECEIPTCONFIRMATION.待确认
+    };
 
-    let updateInfo:any = {paymentNum, offlinePaymentUrl, state:ORDERSTATE.已支付, paymentMethod:PAYMENTTYPE.银行转账};
-    if (!oldInfo.isFirst) {
-        updateInfo.confirmReceipt = RECEIPTCONFIRMATION.待确认;
-    }
     await updateOneData(TABLEENUM.订单表, {id}, updateInfo);
 
     return successResult();

src/biz/officialWebsite.ts

@@ -467,10 +467,12 @@ export async function xueXiYuanDiShiPin({}) {
 export async function xueXiYuanDiWenZi({}) {
     let dataList = [];
     let findParam = {articleType:{"$in":[ARTICLEPOSITION.学习园地_文字资料]}, display:STATE.是};
-    let wzDBList = await findToSortToPage(TABLEENUM.文章管理, findParam, ["id", "title", "articleTime"], {articleTime:-1}, 1);
+    let wzDBList = await findToSortToPage(TABLEENUM.文章管理, findParam, ["id", "title", "articleTime", "imgUrl"], {articleTime:-1}, 1);
     wzDBList.forEach(info => {
         let addInfo:any = extractData(info, ["id", "title", "articleTime"]); 
         addInfo.articleTime = moment(addInfo.articleTime).format("YYYY-MM-DD");
+        if (info.imgUrl && info.imgUrl[0]) addInfo.imgUrl = info.imgUrl[0];
+        else addInfo.imgUrl = ""
         dataList.push(addInfo);
     });
 
@@ -696,10 +698,11 @@ export async function weiYuanMingDanList({name, agencyId, pageNumber, pageSize})
     let selectParam:any = {agencyId};
     if (name) selectParam.name = {"$regex":name};
     let dataList = [];
-    let dbList = await findToSortToPage(TABLEENUM.委员名单, selectParam, ["name", "branchDuties", "unit", "unitDuties"], {branchDuties:-1, ut:-1}, pageNumber, pageSize);
+    let dbList = await findToSortToPage(TABLEENUM.委员名单, selectParam, ["name", "branchDuties", "unit", "unitDuties"], {branchDuties:1, ut:-1}, pageNumber, pageSize);
     let dataCount = await findCount(TABLEENUM.委员名单, selectParam);
     dbList.forEach(info => {
         let addInfo:any = extractData(info, ["name", "unit", "unitDuties"]);
+        info.branchDuties.sort();
         addInfo.branchDuties = changeEnumValue(BRANCHPOSITION, info.branchDuties);
         dataList.push(addInfo);
     });

src/biz/portal/fenZhiJiGou/weiYuanMingDan.ts

@@ -7,7 +7,7 @@ import { ERRORENUM } from "../../../config/errorEnum";
 import { addOneData } from "../../../data/add";
 import { deleteOneData } from "../../../data/delete";
 import { TABLEENUM } from "../../../data/models/model";
-import { find, findCount, findOnce, findToPage } from "../../../data/select";
+import { find, findCount, findOnce, findToPage, findToSortToPage } from "../../../data/select";
 import { updateOneData } from "../../../data/update";
 import { generateSystemId, successResult } from "../../../tools/system";
 import { BizError } from "../../../util/bizError";
@@ -62,7 +62,7 @@ export async function del({userId, id}) {
 
 export async function list({userId, agencyId, pageNumber}) {
     
-    let dbList = await findToPage(TABLEENUM.委员名单, {agencyId}, ["id", "name", "branchDuties", "unit", "unitDuties"], pageNumber);
+    let dbList = await findToSortToPage(TABLEENUM.委员名单, {agencyId}, ["id", "name", "branchDuties", "unit", "unitDuties"], {branchDuties:1}, pageNumber);
     let dataCount = await findCount(TABLEENUM.委员名单, {agencyId});
 
     let dataList = [];

src/biz/register.ts

@@ -171,9 +171,9 @@ export async function memberRegister2({form, id}) {
  */
 export async function unitMemberRegister2({form, keyanForm, id}) {
     const keyanFormItemConfig = {
-        startTime: 'Number',
-        endTime: 'Number',
-        describe: 'String'
+        startTime: {type:'Number'},
+        endTime: {type:'Number'},
+        describe: {type:'String'}
     };
     keyanForm.forEach(item => {
         eccFormParam("会员注册流程二", keyanFormItemConfig, item );
@@ -306,7 +306,7 @@ export async function memberRegisterSendCode({phone}) {
  * @returns {基本信息, 单位信息, 单位所获得科研成果}
  */
 
-const UnitBasicConfig = ["userId", "unitName", "sheng", "shi", "qu", "addres", "uscc", "legalPerson", "legalPersonPhone", "legalPersonMail", "unitMail", 
+const UnitBasicConfig = ["userId", "unitName", "sheng", "shi", "qu", "addres", "uscc", "legalPerson", "legalPersonPhone", "legalPersonMail",
 "contactPerson", "contactPersonDuties", "contactPersonPhone", "uusinessLicenseUrl"];
 const UnitConfig = ["unitMemberType", "yuanXiaoBanXueLeiXing", "yuanXiaoZhuGuanBuMen", "yuanXiaoFuZeRen", "yuanXiaoFuZeRenZhiWu", "yuanXiaoBanGongFuZeRenZhiWu", 
 "yuanXiaoFuZeRenDianHua", "yuanXiaoBanGongFuZeRen", "yuanXiaoBanGongFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang", "yuanXiaoKeYanFuZeRen", "yuanXiaoKeYanFuZeRenDianHua", 

src/biz/task.ts

 import moment = require("moment");
-import { ARTICLEPOSITION, MEMBERLEVEL, MEMBERTYPE, PARTYBUILDSUBTYPEENUM, PARTYBUILDTYPEENUM, PAYMENTSTATUS, STATE, USERREGISTERSTATE } from "../config/enum";
+import { ARTICLEPOSITION, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, PARTYBUILDSUBTYPEENUM, PARTYBUILDTYPEENUM, PAYMENTSTATUS, STATE, USERREGISTERSTATE } from "../config/enum";
 import { TABLEENUM } from "../data/models/model";
-import { find, findCount, findOnce } from "../data/select";
+import { find, findCount, findOnce, findOnceToSort } from "../data/select";
 import { createOrder } from "./member/order";
 import { updateOneData } from "../data/update";
 
@@ -36,14 +36,17 @@ export async function createUserOrder() {
         let userList = await find(TABLEENUM.用户表, selectParam, files );
         let addCount = 0;
         for (let i= 0; i < userList.length; i++) {
-            let { userId, lifespanEndTime, loginId, phone, unitName, memberLevel, memberType, unitMemberType, individualMemberType} = userList[i];
-            let itemInfo = await findOnce(TABLEENUM.订单表, {userId, orderCycleStart:{"$gte":lifespanEndTime}}, "orderCycleStart");
-            if (!itemInfo || !itemInfo.orderCycleStart) {
-                /**创建一条新的订单 */
-                let subType = memberType == MEMBERTYPE.个人会员 ? individualMemberType : unitMemberType;
-                await createOrder(userId, loginId, phone, unitName, lifespanEndTime, memberLevel, memberType, subType, false);
-                await updateOneData(TABLEENUM.用户表, {userId}, {paymentStatus:PAYMENTSTATUS.未支付});
-                addCount += 1;
+            let { userId, loginId, phone, unitName, memberLevel, memberType, unitMemberType, individualMemberType} = userList[i];
+            let itemInfo = await findOnceToSort(TABLEENUM.订单表, {userId}, {orderCycleStart:-1}, ["id", "orderCycleStart", "orderCycleEnd"]);
+            if (itemInfo && itemInfo.id) {//第一条订单应该由审核员创建 不应该由系统创建
+                if (itemInfo.orderCycleEnd < NowMs ) {
+                    /**创建一条新的订单 */
+                    let subType = memberType == MEMBERTYPE.个人会员 ? individualMemberType : unitMemberType;
+                    let newOrderStartTime = itemInfo.orderCycleEnd;//新订单的开始时间是上一条订单的结束时间
+                    await createOrder(userId, loginId, phone, unitName, newOrderStartTime, memberLevel, memberType, subType, false);
+                    await updateOneData(TABLEENUM.用户表, {userId}, {paymentStatus:PAYMENTSTATUS.未支付, memberState:MEMBERSTATE.异常, });
+                    addCount += 1;
+                }
             }
         }
         console.log(`已创建${addCount}条订单`);

src/data/models/model.ts

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

src/dataScript.ts

@@ -12,9 +12,8 @@ import { createOrder } from "./biz/member/order";
  * 注册账号
  */
 export async function test1() {
-
     let i = parseInt(`${moment().hour()}${moment().minute()}${moment().second()}`);
-    let maxi = i + 8;
+    let maxi = i + 20;
     let dataList = [];
     for (i; i < maxi; i++) {
         let nowMs = new Date().valueOf();
@@ -27,6 +26,7 @@ export async function test1() {
             "adminLv" : [],
             "registerFlow" : 2,
             "isAdmin" : 0,
+            "isFirstPay" : false,
             "userRegisterState" : 1,
             "memberState" : 1,
             "memberLevel" : 1,
@@ -78,6 +78,75 @@ export async function test1() {
     console.log("初始化成功");
 }
 
+export async function test2() {
+    let i = parseInt(`${moment().hour()}${moment().minute()}${moment().second()}`);
+    let maxi = i + 20;
+    let dataList = [];
+    for (i; i < maxi; i++) {
+        let nowMs = new Date().valueOf();
+        let randomNum = parseInt(`${moment().hour()}${moment().minute()}${moment().second()}${Math.ceil(Math.random() * 100)}`);
+        let userId = generateUserId();
+        let endTime = new Date(moment().add(1, 'd').format("YYYY-MM-DD")+' 00:00:00').valueOf();
+        dataList.push({
+            "token" : "",
+            "tokenMs" : 0,
+            "isInput" : false,
+            "inputUserChangePwd" : false,
+            "adminLv" : [],
+            "registerFlow" : 3,
+            "isAdmin" : 0,
+            "userRegisterState" : 1,
+            "memberState" : 1,
+            "memberLevel" : 1,
+            "isFirstPay" : false,
+            "isGracePeriod" : 0,
+            "profCategory" : [],
+            "auxiliaryMaterial" : [],
+            "userId" : userId,
+            "memberType" : 2,
+            "askForTime" : nowMs,
+            "loginId" : randomNum,
+            "mail" : "16621071125@163.com",
+            "pwd" : "123456",
+            "phone" : `1812093${Math.ceil(Math.random() * 10)}${Math.ceil(Math.random() * 10)}${Math.ceil(Math.random() * 10)}${Math.ceil(Math.random() * 10)}`,
+            "__v" : 0,
+            "ZhuYaoFuZeRenYouXiang" : "16621071125@163.com",
+            "addres" : "asfasfsda",
+            "contactPerson" : "16621071125",
+            "contactPersonDuties" : "16621071125",
+            "contactPersonPhone" : "16621071125",
+            "danWeiJianJie" : "吃成都成都成都成都成都",
+            "jiaoXueFuZeRenDianHua" : "16621071125",
+            "jiaoXueFuZeRenXinMing" : "sdfs",
+            "kaishezhuanYe" : "测试",
+            "legalPerson" : "12312321",
+            "legalPersonMail" : "16621071125@163.com",
+            "legalPersonPhone" : "16621071125",
+            "qu" : "350102",
+            "sheng" : "350000",
+            "shi" : "350100",
+            "unitMemberType" : 9,
+            "unitName" : `V${randomNum}`,
+            "uscc" : "1111111111111111",
+            "uusinessLicenseUrl" : "http://wenhuabu-files.oss-cn-beijing.aliyuncs.com/aae42fa7664b8c43945694c561d6cba7/undefined/1713925918987/Snipaste_2024-02-27_15-21-46.png",
+            "yuanXiaoBanGongFuZeRen" : "sdfs",
+            "yuanXiaoBanGongFuZeRenDianHua" : "16621071125",
+            "yuanXiaoBanXueLeiXing" : 1,
+            "yuanXiaoFuZeRen" : "sdfs",
+            "yuanXiaoFuZeRenDianHua" : "16621071125",
+            "yuanXiaoFuZeRenZhiWu" : "fdsfs",
+            "yuanXiaoJiaoZhiGongZongRenShu" : "12312",
+            "yuanXiaoKeYanFuZeRen" : "sdfasf",
+            "yuanXiaoKeYanFuZeRenDianHua" : "16621071125",
+            "yuanXiaoXueShengZongRenShu" : "123",
+            "yuanXiaoZhuGuanBuMen" : "sdfsd",
+            "applicationForm" : "http://wenhuabu-files.oss-cn-beijing.aliyuncs.com/aae42fa7664b8c43945694c561d6cba7/undefined/1713926286655/功能清单.png"
+        });
+    }
+    await addManyData(TABLEENUM.用户表, dataList);
+    console.log("初始化成功");
+}
+
 
 export async function initOrderData() {
     let randomNum = parseInt(`${moment().hour()}${moment().minute()}${moment().second()}${Math.ceil(Math.random() * 100)}`);

src/main.ts

@@ -17,6 +17,8 @@ async function lanuch() {
     await initSMS();
     await initAdmin();
     await initSystemTask();
+
+    // await test1();
     console.log("服务初始化成功");
 }
 

src/routers/member/router.ts

@@ -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},
                         contactPerson:{type:'String', desc:'日常联系人', notMustHave:false},
                         contactPersonDuties:{type:'String', desc:'日常联系人职务', notMustHave:false},
                         contactPersonPhone:{type:'String', desc:'日常联系人手机', notMustHave:false},
@@ -127,9 +127,11 @@ export const Config = {
                         yuanXiaoKeYanFuZeRen:{type:'String', desc:'院校科研负责人', notMustHave:false},
                         yuanXiaoKeYanFuZeRenDianHua:{type:'String', desc:'院校科研负责人电话', notMustHave:false},
                         jiaoXueFuZeRenXinMing:{type:'String', desc:'教学负责人姓名', notMustHave:false},
-                        yuanXiaoXueShengZongRenShu:{type:'String', desc:'院校学生总人数', notMustHave:false},
-                        yuanXiaoJiaoZhiGongZongRenShu:{type:'String', desc:'院校教职工总人数', notMustHave:false},
+                        yuanXiaoXueShengZongRenShu:{type:'Number', desc:'院校学生总人数', notMustHave:false},
+                        yuanXiaoJiaoZhiGongZongRenShu:{type:'Number', desc:'院校教职工总人数', notMustHave:false},
                         jiaoXueFuZeRenDianHua:{type:'String', desc:'教学负责人电话', notMustHave:false},
+                        kaishezhuanYe:{type:'String', desc:'开设专业', notMustHave:true},
+                        danWeiJianJie:{type:'String', desc:'单位简介', notMustHave:true},
                     }
                 },
                 {
@@ -341,6 +343,8 @@ export const Config = {
                         yuanXiaoKeYanFuZeRenDianHua:{type:'String', desc:'科研负责人电话'},
                         jiaoXueFuZeRenXinMing:{type:'String', desc:'教学负责人姓名'},
                         jiaoXueFuZeRenDianHua:{type:'String', desc:'教学负责人电话'},
+                        kaishezhuanYe:{type:'String', desc:'开设专业', notMustHave:true},
+                        danWeiJianJie:{type:'String', desc:'单位简介', notMustHave:true}
                     },
                     desc:"表单"
                 },
@@ -730,6 +734,8 @@ export const Config = {
                         yuanXiaoKeYanFuZeRenDianHua:{type:'String', desc:'科研负责人电话'},
                         jiaoXueFuZeRenXinMing:{type:'String', desc:'教学负责人姓名'},
                         jiaoXueFuZeRenDianHua:{type:'String', desc:'教学负责人电话'},
+                        kaishezhuanYe:{type:'String', desc:'开设专业', notMustHave:true},
+                        danWeiJianJie:{type:'String', desc:'单位简介', notMustHave:true}
                     },
                     desc:"表单"
                 },

src/routers/portal/router.ts

@@ -1053,7 +1053,7 @@ export const Config = {
         },
         {
             apiName:"创建",
-            subUrl:'/fenzhijigou/jigouguanli/weiyuanmingdan/add', 
+            subUrl:'/fenzhijigou/jigouguanli/weiyuanmingdan/add',
             param:[
                 {key:"form", type:"Object", sub:
                     {

src/routers/router.ts

@@ -23,10 +23,10 @@ const Look = false;//true更新文档
 export async function setRouter(httpServer){
     if (Look) {
         await getDoc();
-        await initDoc(portalRouter.FirstName, portalRouter.Config, portalRouter.FirstRouter);//网站编辑
+        // await initDoc(portalRouter.FirstName, portalRouter.Config, portalRouter.FirstRouter);//网站编辑
         // await initDoc(publicRouter.FirstName, publicRouter.Config, publicRouter.FirstRouter);//公用组件
         // await initDoc(memberRouter.FirstName, memberRouter.Config, memberRouter.FirstRouter);//用户路由
-        await initDoc(officalWebsiteRouter.FirstName, officalWebsiteRouter.Config, officalWebsiteRouter.FirstRouter);//官网路由
+        // await initDoc(officalWebsiteRouter.FirstName, officalWebsiteRouter.Config, officalWebsiteRouter.FirstRouter);//官网路由
         // await initDoc(orderRouter.FirstName, orderRouter.Config, orderRouter.FirstRouter);//会费相关
         // await initDoc(costRouter.FirstName, costRouter.Config, costRouter.FirstRouter);//支付
     }