Merge branch 'master' of http://123.207.147.179:8888/node_server/wenHuaBu_adminServer

# Conflicts:
#	src/biz/member/finance/invoice.ts

src/biz/member/examine.ts

@@ -338,8 +338,12 @@ export async function rejectList({name, memberType, documentId, phone, mail, she
     for (let i = 0; i < dbList.length; i++) {
         let info = dbList[i];
         let item:any = extractData(info, SelectFiles);
-        let historyList = await findOnce(TABLEENUM.审批历史表, {userId:info.userId, operationBehavipr:USERREGISTERSTATE.驳回修改});
-        item.operationTime = moment(historyList.operationTime).format("YYYY-MM-DD");
+        let historyInfo = await findOnce(TABLEENUM.审批历史表, {userId:info.userId, operationBehavipr:USERREGISTERSTATE.驳回修改});
+
+        if (historyInfo && historyInfo.userId) {
+            item.operationTime = moment(historyInfo.operationTime).format("YYYY-MM-DD");
+        } else item.operationTime = "-"
+        
         /**处理枚举值 */
         if (!item.userRegisterState) item.userRegisterState = USERREGISTERSTATE.待审核;
         else item.userRegisterState = changeEnumValue(USERREGISTERSTATE, item.userRegisterState);

src/biz/member/finance/invoice.ts

@@ -33,7 +33,7 @@ import { successResult } from "../../../tools/system";
  * @param weChartPR 微信订单号
  * @param pageNumber 当前页
  */
-export async function billStateList({name, memberType, documentId, invoiceApplyMs, phone, mail, joinStartTime, pageSize, joinEndTime, memberLevel, payState,paymentType, invoiceState, weChartPR, pageNumber}) {
+export async function billStateList({name, memberType, documentId, invoiceApplyMs, phone, mail, joinStartTime, joinEndTime, memberLevel, payState,paymentType, invoiceState, weChartPR, pageSize, pageNumber}) {
     let testMs = new Date().valueOf();
     if (payState != 1 && payState != 2 && payState != 3) throw new BizError(ERRORENUM.参数错误);
     let findParam:any = {invoiceStatus:{"$ne":INVOICESTATUS.已开发票}};
@@ -476,7 +476,7 @@ export async function invoicedList({name, memberType, documentId, invoiceExamine
     if (isPay) findParam.state = isPay;
     if (weChartPR) findParam.paymentNum = {"$regex":`${weChartPR}`};
 
-    let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "state", "paymentNum", "userId", "desc"];
+    let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "invoiceExamineTime", "paymentMethod", "memberCategory", "state", "paymentNum", "userId", "desc"];
     let dbList = await findToPage(TABLEENUM.订单表, findParam, selectFile, pageNumber);
     let dataCount = await findCount(TABLEENUM.订单表, findParam);
 
@@ -493,7 +493,7 @@ export async function invoicedList({name, memberType, documentId, invoiceExamine
 
     let dataList = [];
 
-    let itemFile = ["id", "unitName", "money", "paymentNum", "state", "userId", "memberCategory", "paymentMethod", "desc"];
+    let itemFile = ["id", "unitName", "money", "paymentNum", "state", "userId", "memberCategory", "paymentMethod", "desc", "invoiceExamineTime"];
     
     for (let i = 0; i < dbList.length; i++) {
         let info = dbList[i];
@@ -517,6 +517,8 @@ export async function invoicedList({name, memberType, documentId, invoiceExamine
         }
         itemData.memberState = changeEnumValue(MEMBERSTATE, userInfo.memberState);
         itemData.name = userInfo.name;
+
+        itemData.invoiceExamineTime = info.invoiceExamineTime ? moment(info.invoiceExamineTime).format("YYYY-MM-DD") : '-';
         dataList.push(itemData);
     }
 
@@ -540,7 +542,8 @@ export async function invoicedList({name, memberType, documentId, invoiceExamine
         selectConf.push(info.value);
     })
     
-    let selectFile = ["id", "unitName", "userId", "orderCycleStart", "orderCycleEnd", "operationTime", "money", "paymentMethod", "memberCategory", "paymentNum", "desc", "invoiceMail", "confirmReceiptMs", "payTime"];
+    let selectFile = ["id", "unitName", "userId", "orderCycleStart", "orderCycleEnd", "invoiceExamineTime", "money", "paymentMethod", "memberCategory", "paymentNum", "desc", "invoiceMail", "confirmReceiptMs", "payTime"];
+
     let dbList = await find(TABLEENUM.订单表, findParam, selectFile);
     let timeChnageList = ["orderCycleStart", "operationTime", "confirmReceiptMs", "payTime"];
 
@@ -569,6 +572,9 @@ export async function invoicedList({name, memberType, documentId, invoiceExamine
                     value = "-";
                 }
             }
+            if (key == "invoiceExamineTime") {
+                value = value ? moment(value).format("YYYY-MM-DD") : '-';
+            }
             if (key == "orderCycle") value = `${moment(info.orderCycleStart).format("YYYY-MM-DD")}至${moment(info.orderCycleEnd).format("YYYY-MM-DD")}`;
             if (value && value != "-") {
                 if (timeChnageList.indexOf(key) != -1) value = moment(value).format("YYYY-MM-DD");

src/config/outPutConfig.ts

@@ -139,7 +139,8 @@ export enum INVOICEDCOLUMNS {
     提交时间 = "operationTime", //上传转账凭证的时间
     支付时间 = "payTime", //微信支付的时间
     会员职务 = "memberLevel",  
-    注册手机号="phone"
+    注册手机号="phone",
+    已开发票时间 = "invoiceExamineTime"
 }
 
 

src/routers/order/router.ts

@@ -76,7 +76,7 @@ export const Config = {
                 {key:"payState", type:"Number", desc:"支付状态 1是已支付 2是未支付 3是全部"},
                 {key:"invoiceState", type:"Number", desc:"发票状态 0是全部 1是已申请 2是未申请",  isNull:true},
                 {key:"weChartPR", type:"String", desc:"微信支付单号", isNull:true},
-                {key:"invoiceApplyMs", type:"String", desc:"发票申请时间", isNull:true},
+                {key:"invoiceApplyMs", type:"Number", desc:"发票申请时间", isNull:true},
                 {key:"pageNumber", type:"Number", desc:"分页-当前页面"},
                 {key:"pageSize", type:"Number", desc:"分页-一页大小"}
             ],