财务管理

src/biz/member/order.ts

@@ -203,7 +203,7 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
     if (paymentType) findParam.paymentMethod = paymentType;
     if (costType) findParam.isFirst = costType == COSTTYPE.首次;
 
-    let selectFile = ["id", "unitName", "userId", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "isFirst", "paymentNum", "memberState" ];
+    let selectFile = ["id", "unitName", "userId", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "isFirst", "paymentNum", "memberState", "operationTime" ];
     let dbList = await findToPage(TABLEENUM.订单表, findParam, selectFile, pageNumber);
     let dataCount = await findCount(TABLEENUM.订单表, findParam);
 
@@ -215,6 +215,7 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
         let itemData:any = extractData(info, itemFile);
        
         itemData.joinTime = moment(info.orderCycleStart).format("YYYY-MM-DD");
+        itemData.operationTime = moment(info.operationTime).format("YYYY-MM-DD");
         itemData.memberType = changeEnumValue(MEMBERTYPE, info.memberCategory);
         itemData.paymentMethod = changeEnumValue(PAYMENTTYPE, info.paymentMethod);
         itemData.costType = info.isFirst == COSTTYPE.首次 ? "首次" : "续费";
@@ -224,8 +225,9 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
             itemData.paymentMethod = "-";
             itemData.paymentNum = "-";
         }
-        let userInfo = await findOnce(TABLEENUM.用户表, {userId:info.userId}, ["memberState", "name"]);
+        let userInfo = await findOnce(TABLEENUM.用户表, {userId:info.userId}, ["memberState", "name", "memberLevel"]);
         if (userInfo) itemData.memberState = changeEnumValue(MEMBERSTATE, userInfo.memberState);
+        itemData.memberLevel = changeEnumValue(MEMBERLEVEL, userInfo.memberLevel);
         itemData.name = userInfo.name;
 
         dataList.push(itemData);
@@ -439,16 +441,18 @@ export async function billStateList({name, memberType, documentId, phone, mail,
     }
     if (isPay) findParam.state = isPay;
 
-    let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "state", "paymentNum", "userId" ];
+    let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "state", "paymentNum", "userId", "desc", "invoiceMail"];
     let dbList = await findToPage(TABLEENUM.订单表, findParam, selectFile, pageNumber);
     let dataCount = await findCount(TABLEENUM.订单表, findParam);
 
     let dataList = [];
 
-    let itemFile = ["id", "userId", "unitName", "money", "paymentNum", "memberCategory", "state", "paymentMethod"];
+    let itemFile = ["id", "userId", "unitName", "money", "paymentNum", "memberCategory", "state", "paymentMethod", "desc", "invoiceMail"];
     for (let i= 0; i < dbList.length; i++) {
         let info = dbList[i];
         let itemData:any = extractData(info, itemFile);
+        if (!itemData.desc) itemData.desc = "";
+        if (!itemData.invoiceMail) itemData.invoiceMail = "";
         itemData.joinTime = moment(info.orderCycleStart).format("YYYY-MM-DD");
         itemData.memberType = changeEnumValue(MEMBERTYPE, itemData.memberCategory);
         itemData.paymentMethod = changeEnumValue(PAYMENTTYPE, itemData.paymentMethod);
@@ -669,17 +673,18 @@ export async function invoicedList({name, memberType, documentId, phone, mail, j
     if (paymentType) findParam.paymentMethod = paymentType;
     if (isPay) findParam.state = isPay
 
-    let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "state", "paymentNum", "userId" ];
+    let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "state", "paymentNum", "userId", "desc"];
     let dbList = await findToPage(TABLEENUM.订单表, findParam, selectFile, pageNumber);
     let dataCount = await findCount(TABLEENUM.订单表, findParam);
 
     let dataList = [];
 
-    let itemFile = ["id", "unitName", "money", "paymentNum", "state", "userId", "memberCategory", "paymentMethod"];
+    let itemFile = ["id", "unitName", "money", "paymentNum", "state", "userId", "memberCategory", "paymentMethod", "desc"];
     
     for (let i = 0; i < dbList.length; i++) {
         let info = dbList[i];
         let itemData:any = extractData(info, itemFile);
+        if (!itemData.desc) itemData.desc = "";
         itemData.joinTime = moment(info.orderCycleStart).format("YYYY-MM-DD");
         itemData.memberType = changeEnumValue(MEMBERTYPE, itemData.memberCategory);
         itemData.paymentMethod = changeEnumValue(PAYMENTTYPE, itemData.paymentMethod);
@@ -1110,6 +1115,59 @@ export async function refundApprove({id, refundImgUrl}) {
 }
 
 
+/**
+ * 发票管理-退款列表-数据导出
+ * @param param0 
+ */
+ export async function outPutRefund({exportColumns}) {
+    let findParam:any = { 
+        isReceive:ISRECEIVE.提供账户_zkh需退款_ykh
+    };
+
+    let selectTitle = [];
+    let selectConf = [];
+    exportColumns.forEach( info=> {
+        selectTitle.push(info.key);
+        selectConf.push(info.value);
+    })
+    
+    let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "memberCategory", "userId", "refundBankCarId", "refundBankName", "refundSuccessful", "isReplenishReturnInfo" ];
+    let dbList = await find(TABLEENUM.订单表, findParam, selectFile);
+    let timeChnageList = ["orderCycleStart", "operationTime"];
+
+    let dataList = [selectTitle];
+    for (let i = 0; i < dbList.length; i++) {
+        let info = dbList[i];
+        let userInfo = await findOnce(TABLEENUM.用户表, {userId:info.userId}, ["memberState", "name", "unitName"]);
+        let subList = [];
+        for (let i = 0; i < selectConf.length; i++) {
+            let key = selectConf[i];
+            let value = info[key] || "";
+            if (key == "name") {
+                if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.name;
+                else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.unitName;
+            }
+            if (key == "state") {
+                if (!info.isReplenishReturnInfo) value = "资料补充中";
+                else {
+                    if (info.refundSuccessful) value = "已退款";
+                    else value = "待退款"; 
+                }
+            }
+            if (value) {
+                if (timeChnageList.indexOf(key) != -1) value = moment(value).format("YYYY-MM-DD");
+                else if (key == "memberCategory") value = changeEnumValue(MEMBERTYPE, value);
+                else if (key == "orderCycle") value = `${moment(info.orderCycleStart).format("YYYY-MM-DD")}至${moment(info.orderCycleEnd).format("YYYY-MM-DD")}`;
+            }
+            subList.push(value);
+        }
+        dataList.push(subList);
+    }
+
+    return {dataList};
+}
+
+
 
 /**
  * 审批历史

src/config/enum.ts

@@ -573,7 +573,8 @@ export enum ADMINTYPE {
  */
 export enum ADMINFIRSTDIR {
     网站管理 = 1,
-    会员管理 = 2
+    会员管理 = 2,
+    会员操作 = 3
 }
 
 
@@ -597,6 +598,8 @@ export enum ADMINLV {
     管理设置 = 206,
     标签系统,
     通知管理 = 208,
+    会员信息修改 = 301,
+    单位会员申请表
 }
 
 

src/config/outPutConfig.ts

@@ -126,6 +126,21 @@ export enum INVOICEDCOLUMNS {
 }
 
 
+/**
+ * 退款列表导出列-发票管理
+ * Refund
+ */
+export enum REFUNDCOLUMNS {
+    "退款状态" = "state",
+    会员类别 = "memberCategory",
+    "单位/个人名称" = "name",
+    所缴周期 = "orderCycle",
+    退款金额 = "money",
+    退款账号 = "refundBankCarId",
+    开户行 = "refundBankName"
+}
+
+
 
 
 

src/routers/order/router.ts

@@ -214,6 +214,14 @@ export const Config = {
             ],
             bindBiz:orderBiz.refundApprove
         },
+        {
+            apiName:"退款列表-数据导出",
+            subUrl:'/order/invoice/examine/outputrefund',
+            param:[
+                {key:"exportColumns", type:"[]", desc:"导出数据列"}
+            ],
+            bindBiz:orderBiz.outPutRefund
+        },
         // {
         //     apiName:"审批历史",
         //     subUrl:'/order/approve/log',

src/routers/public/router.ts

@@ -336,6 +336,13 @@ export const Config = {
             param:[],
             defaultParam:outPutConfig.INVOICEDCOLUMNS,
             bindBiz:publicBiz.setEnumInterface
+        },
+        {
+            apiName:"发票管理-退款列表导出列",
+            subUrl:'/refundcolumns',
+            param:[],
+            defaultParam:outPutConfig.REFUNDCOLUMNS,
+            bindBiz:publicBiz.setEnumInterface
         }
     ],