no message

src/biz/member/order.ts

@@ -223,7 +223,9 @@ export async function confirmReceiptPass({id}) {
     if (orderInfo.isFirst && !orderInfo.firstPayExamine ) throw new BizError(ERRORENUM.重复提交, '发票管理-财务核对页-收款确认', `提交通过时订单未通过待支付页的校验`);
     if (orderInfo.confirmReceipt != RECEIPTCONFIRMATION.待确认) throw new BizError(ERRORENUM.重复提交, '发票管理-财务核对页-收款确认', `提交通过时订单已经不是待确认 是${orderInfo.confirmReceipt}`);
 
-    await updateOneData(TABLEENUM.订单表, {id}, {confirmReceipt:RECEIPTCONFIRMATION.收款确认, invoiceStatus:INVOICESTATUS.未开发票});
+    let updateInfo:any = {confirmReceipt:RECEIPTCONFIRMATION.收款确认};
+    if (orderInfo.invoiceStatus != INVOICESTATUS.已开发票) updateInfo.invoiceStatus = INVOICESTATUS.未开发票;
+    await updateOneData(TABLEENUM.订单表, {id}, updateInfo);
 
     return successResult();
 }

src/biz/officialWebsite.ts

@@ -612,7 +612,7 @@ export async function fenHuiDongTaiInfo({id}) {
  */
 export async function weiYuanMingDanList({name, agencyId, pageNumber, pageSize}) {
     let selectParam:any = {agencyId};
-    if (name) selectParam.name = name;
+    if (name) selectParam.name = {"$regex":name};
     let dataList = [];
     let dbList = await findToSortToPage(TABLEENUM.委员名单, selectParam, ["name", "branchDuties", "unit", "unitDuties"], {branchDuties:1}, pageNumber, pageSize);
     let dataCount = await findCount(TABLEENUM.委员名单, selectParam);

src/biz/portal/dangJianGonZuo/xueXiYuanDi.ts

@@ -12,6 +12,7 @@ import { find, findOnce } from "../../../data/select";
 import { updateOneData } from "../../../data/update";
 import { successResult } from "../../../tools/system";
 import { BizError } from "../../../util/bizError";
+import { wenZhangQueue } from "../../task";
 
 
 export async function list() {
@@ -61,6 +62,8 @@ export async function update(secureArgs:any) {
     if (!oldInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
 
     await updateOneData(TABLEENUM.党建, {id}, {name:typeName});
+    /**更新缓存名字 */
+    wenZhangQueue[id] = typeName;
 
     return successResult();
 }

src/biz/portal/dangJianGonZuo/zhuTiJiaoYu.ts

@@ -9,6 +9,7 @@ import { find, findOnce } from "../../../data/select";
 import { updateOneData } from "../../../data/update";
 import { successResult } from "../../../tools/system";
 import { BizError } from "../../../util/bizError";
+import { wenZhangQueue } from "../../task";
 
 
 export async function list() {
@@ -42,6 +43,9 @@ export async function update({userId, id, typeName}) {
 
     await updateOneData(TABLEENUM.党建, {id}, {name:typeName});
 
+    /**更新缓存名字 */
+    wenZhangQueue[id] = typeName;
+
     return successResult();
 }
 

src/biz/portal/neiRongGuanLi/bannerGuanLi.ts

@@ -3,15 +3,17 @@
  */
 
 
+import { BANNERPOSITION } from "../../../config/enum";
 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 { updateOneData } from "../../../data/update";
-import { generateSystemId, successResult } from "../../../tools/system";
+import { changeArticleName, generateSystemId, successResult } from "../../../tools/system";
 import { BizError } from "../../../util/bizError";
 import { extractData } from "../../../util/piecemeal";
+import { changeEnumValue } from "../../../util/verificationEnum";
 
 
 /**
@@ -66,10 +68,15 @@ export async function list(secureArgs:any) {
     let dataCount = await findCount(TABLEENUM.banner管理, selectParam);
 
     let dataList = [];
-    dbList.forEach(info => {
-        let item = extractData(info, [ "id", "location","articleTitle", "position","articleUrl", "display", "desc"]);
+    for (let i = 0; i < dbList.length; i++) {
+        let info = dbList[i];
+        let item:any = extractData(info, [ "id", "location","articleTitle", "position","articleUrl", "display", "desc"]);
+        let articleInfo = await findOnce(TABLEENUM.文章管理, {id:item.articleTitle}, ["id", "title"]);
+        item.articleTitle = articleInfo.id ? articleInfo.title : '';
+        item.location = changeEnumValue(BANNERPOSITION, item.location);
+        item.position = changeArticleName([item.position]);
         dataList.push(item);
-    });
+    }
 
     return {dataList, dataCount};
 }

src/biz/portal/neiRongGuanLi/shiPinGuanLi.ts

@@ -2,6 +2,7 @@
  * 视频管理
  */
 
+import { VIDEOPOSITION } from "../../../config/enum";
 import { ERRORENUM } from "../../../config/errorEnum";
 import { addOneData } from "../../../data/add";
 import { deleteOneData } from "../../../data/delete";
@@ -11,6 +12,7 @@ import { updateOneData } from "../../../data/update";
 import { generateSystemId, successResult } from "../../../tools/system";
 import { BizError } from "../../../util/bizError";
 import { extractData } from "../../../util/piecemeal";
+import { changeEnumValue } from "../../../util/verificationEnum";
 
 
 /**
@@ -74,7 +76,8 @@ export async function list(secureArgs:any) {
     let dataList = [];
     dbList.forEach(info => {
 
-        let item = extractData(info, ["id", "title", "videoType", "videoTime", "desc", "display"]);
+        let item:any = extractData(info, ["id", "title", "videoType", "videoTime", "desc", "display"]);
+        item.videoType = changeEnumValue(VIDEOPOSITION, item.videoType);
         dataList.push(item);
     });
 

src/biz/portal/neiRongGuanLi/wenZhangGuanLi.ts

@@ -10,9 +10,11 @@ import { deleteOneData } from "../../../data/delete";
 import { TABLEENUM } from "../../../data/models/model";
 import { find, findCount, findOnce, findToPage } from "../../../data/select";
 import { updateOneData } from "../../../data/update";
-import { generateSystemId, successResult } from "../../../tools/system";
+import { changeArticleName, generateSystemId, successResult } from "../../../tools/system";
 import { BizError } from "../../../util/bizError";
 import { extractData } from "../../../util/piecemeal";
+import { changeEnumValue } from "../../../util/verificationEnum";
+import { wenZhangQueue } from "../../task";
 
 
 /**
@@ -44,6 +46,7 @@ export async function update(secureArgs:any) {
     if (!oldInfo || !oldInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
    
     await updateOneData(TABLEENUM.文章管理, {id}, form);
+    
     return successResult();
 }
 
@@ -74,7 +77,8 @@ export async function list(secureArgs:any) {
     let dataCount = await findCount(TABLEENUM.文章管理, selectParam);
     let dataList = [];
     dbList.forEach(info => {
-        let item = extractData(info, [ "id", "title", "articleType", "imgUrl", "articleTime", "desc", "display"]);
+        let item:any = extractData(info, [ "id", "title", "articleType", "imgUrl", "articleTime", "desc", "display"]);
+        item.articleType = changeArticleName( item.articleType);
         dataList.push(item);
     });
 
@@ -118,4 +122,4 @@ export async function getTitleList({type}) {
         });
     });
     return {dataList}
-}
\ No newline at end of file
+}

src/biz/public.ts

@@ -64,7 +64,12 @@ export async function filePosition() {
     let wenZiDBList = await find(TABLEENUM.党建, {type:PARTYBUILDTYPEENUM.学习园地, subType:PARTYBUILDSUBTYPEENUM.文字资料});
     wenZiDBList.forEach(info => {
         let {id, name} = info;
-        dataList.push({key:name, value:id});
+        dataList.push({key:`学习园地-${name}`, value:id});
+    });
+    let zhuTiDBList = await find(TABLEENUM.党建, {type:PARTYBUILDTYPEENUM.主题教育});
+    zhuTiDBList.forEach(info => {
+        let {id, name} = info;
+        dataList.push({key:`主题教育-${name}`, value:id});
     });
 
     return { dataList};

src/biz/task.ts

 import moment = require("moment");
-import { MEMBERLEVEL, MEMBERTYPE, STATE, USERREGISTERSTATE } from "../config/enum";
+import { ARTICLEPOSITION, MEMBERLEVEL, MEMBERTYPE, PARTYBUILDSUBTYPEENUM, PARTYBUILDTYPEENUM, STATE, USERREGISTERSTATE } from "../config/enum";
 import { TABLEENUM } from "../data/models/model";
 import { find, findCount, findOnce } from "../data/select";
 import { createOrder } from "./member/order";
@@ -7,9 +7,11 @@ import { createOrder } from "./member/order";
 /**
  * 初始化任务
  */
-export function initSystemTask() {
+export async function initSystemTask() {
+    /**初始文字管理名称 */
+    await initWenZangQueue();
     /**孵化器月度任务 */
-    createUserOrder();
+    await createUserOrder();
     setInterval(async function () {
         await createUserOrder();
     }, 24 * 3600 * 1000);
@@ -45,3 +47,34 @@ export async function createUserOrder() {
         console.log(`已创建${addCount}条订单`);
     }
 }
+
+
+export let wenZhangQueue = {};
+async function initWenZangQueue() {
+    wenZhangQueue = {};
+    for (let key in ARTICLEPOSITION) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) {
+            let keyStr = key;
+            let value = ARTICLEPOSITION[key];
+            if(/_dou/.test(keyStr)) keyStr = keyStr.replace(/_dou/, "，");
+            if(/_zyh/.test(keyStr)) keyStr = keyStr.replace(/_zyh/, "“");
+            if(/_yyh/.test(keyStr)) keyStr = keyStr.replace(/_yyh/, "”");
+            if(/_dun/.test(keyStr)) keyStr = keyStr.replace(/_dun/, "、");
+            if(/_ju/.test(keyStr)) keyStr = keyStr.replace(/_ju/, "。");
+            if(/_hgh/.test(keyStr)) keyStr = keyStr.replace(/_hgh/, "-");
+            if(/_kbh/.test(keyStr)) keyStr = keyStr.replace(/_kbh/, "");
+            wenZhangQueue[value] = keyStr;
+        }
+    }
+    let wenZiDBList = await find(TABLEENUM.党建, {type:PARTYBUILDTYPEENUM.学习园地, subType:PARTYBUILDSUBTYPEENUM.文字资料});
+    wenZiDBList.forEach(info => {
+        let {id, name} = info;
+        wenZhangQueue[id] = `学习园地-${name}`;
+    });
+    let zhuTiDBList = await find(TABLEENUM.党建, {type:PARTYBUILDTYPEENUM.主题教育});
+    zhuTiDBList.forEach(info => {
+        let {id, name} = info;
+        wenZhangQueue[id] = `主题教育-${name}`;
+    });
+}
\ No newline at end of file

src/tools/system.ts

@@ -5,6 +5,7 @@
  */
 
 import moment = require("moment");
+import { wenZhangQueue } from "../biz/task";
 const md5 = require("md5");
 
 /**
@@ -90,9 +91,6 @@ export function generateWXOrderId(memberType, userId) {
 
 
 
-
-
-
 /**
  * 获取届次
  * @param year 入会年份 
@@ -128,3 +126,12 @@ export function getEdition(year, month) {
 
     // return `第${times}届,第${sessionNumber}次`;
 }
+
+export function changeArticleName(idList) {
+    let str = '';
+    idList.forEach((id, index) => {
+        if (index) str += ',';
+        str += `${wenZhangQueue[id]}`;
+    });
+    return str;
+}
\ No newline at end of file

src/util/verificationEnum.ts

@@ -40,12 +40,26 @@ export function changeEnumValue(enumConf, value:any) {
     if ( typeof value == 'number' ) {
         let str = enumConf[value];
         /** 特化处理 中文引号在枚举中不适用*/
+        if(/_dou/.test(str)) str = str.replace(/_dou/, "，");
+        if(/_zyh/.test(str)) str = str.replace(/_zyh/, "“");
+        if(/_yyh/.test(str)) str = str.replace(/_yyh/, "”");
+        if(/_dun/.test(str)) str = str.replace(/_dun/, "、");
+        if(/_ju/.test(str)) str = str.replace(/_ju/, "。");
+        if(/_hgh/.test(str)) str = str.replace(/_hgh/, "-");
+        if(/_kbh/.test(str)) str = str.replace(/_kbh/, "");
         return str
     }
     let str = "";
     value.forEach((item, index) => {
         let subStr = enumConf[item];
         /** 特化处理 中文引号在枚举中不适用*/
+        if(/_dou/.test(str)) str = str.replace(/_dou/, "，");
+        if(/_zyh/.test(str)) str = str.replace(/_zyh/, "“");
+        if(/_yyh/.test(str)) str = str.replace(/_yyh/, "”");
+        if(/_dun/.test(str)) str = str.replace(/_dun/, "、");
+        if(/_ju/.test(str)) str = str.replace(/_ju/, "。");
+        if(/_hgh/.test(str)) str = str.replace(/_hgh/, "-");
+        if(/_kbh/.test(str)) str = str.replace(/_kbh/, "");
         str += subStr;
         if (index == value.length-1) str+="";
         else str += ","