Commit 856a29a8 by lixinming

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

# Conflicts:
#	src/biz/member/order.ts
parents 92c14c76 01ff57a4
......@@ -7,7 +7,7 @@ import { generateOrderId, successResult } from "../../tools/system";
import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
import { addOneData } from "../../data/add";
import { TABLEENUM } from "../../data/models/model";
import { find, findCount, findOnce, findOnceToSort, findToPage } from "../../data/select";
import { find, findCount, findOnce, findOnceToSort, findToPage, findToSortToPage } from "../../data/select";
import { extractData } from "../../util/piecemeal";
import { BizError } from "../../util/bizError";
import { ERRORENUM } from "../../config/errorEnum";
......@@ -495,19 +495,38 @@ export async function accountInfo({id, form}) {
* 退款列表
* @param param0
*/
export async function refundList({name, pageNumber}) {
export async function refundList({name, memberType, joinStartTime, joinEndTime, pageNumber}) {
let findParam:any = {
isReceive:{"$ne":null}
};
/**用户表查询条件 */
let checkUserIdList = []
let itemParam:any = {};
let isSelectUser = false;
if (name) {
let itemParam = {
isSelectUser = true;
itemParam = {
"$or":[
{unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}}
]
}
}
if (memberType && memberType.length) {
isSelectUser = true;
itemParam["$or"] = [ {unitMemberType:{"$in":memberType}}, {individualMemberType:{"$in":memberType}} ];
}
if (joinStartTime) {
isSelectUser = true;
itemParam["joinTime"] = {"$gt":joinStartTime};
}
if (joinEndTime) {
isSelectUser = true;
if (!itemParam["joinTime"]) itemParam["joinTime"] = {};
itemParam["joinTime"]["$lt"] = joinEndTime;
}
if (isSelectUser) {
let checkUserIdDataList = await find(TABLEENUM.用户表, itemParam, ["userId"]);
checkUserIdDataList.forEach(key => {
checkUserIdList.push(key.userId);
......@@ -518,7 +537,7 @@ export async function refundList({name, pageNumber}) {
}
let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "memberCategory", "userId", "refundBankCarId", "refundBankName", "refundSuccessful", "isReplenishReturnInfo", "desc" ];
let dbList = await findToPage(TABLEENUM.订单表, findParam, selectFile, pageNumber);
let dbList = await findToSortToPage(TABLEENUM.订单表, findParam, selectFile, {orderCycleStart:-1}, pageNumber);
let dataCount = await findCount(TABLEENUM.订单表, findParam);
let dataList = [];
......
......@@ -209,6 +209,9 @@ export const Config = {
subUrl:'/order/refundlist',
param:[
{key:"name", type:"String", desc:"名称", isNull:true},
{key:"joinStartTime", type:"Number", desc:"入会开始时间", isNull:true},
{key:"joinEndTime", type:"Number", desc:"入会结束时间", isNull:true},
{key:"memberType", type:"[Number]", desc:"会员类别", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"},
],
bindBiz:orderBiz.refundList
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment