Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wenHuaBu_adminServer
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
node_server
wenHuaBu_adminServer
Commits
d477dcc6
Commit
d477dcc6
authored
May 15, 2024
by
lixinming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
d9a16cee
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
44 additions
and
9 deletions
+44
-9
memberFees.ts
src/biz/member/memberFees.ts
+26
-2
order.ts
src/biz/member/order.ts
+8
-5
router.ts
src/routers/member/router.ts
+8
-0
router.ts
src/routers/order/router.ts
+1
-1
router.ts
src/routers/router.ts
+1
-1
No files found.
src/biz/member/memberFees.ts
View file @
d477dcc6
...
@@ -243,12 +243,12 @@ export async function getRenewalPeriod({name, memberType, documentId, phone, mai
...
@@ -243,12 +243,12 @@ export async function getRenewalPeriod({name, memberType, documentId, phone, mai
if
(
mail
)
selectParam
.
mail
=
mail
;
if
(
mail
)
selectParam
.
mail
=
mail
;
if
(
memberLevel
.
length
)
selectParam
.
memberLevel
=
{
"$in"
:
memberLevel
};
if
(
memberLevel
.
length
)
selectParam
.
memberLevel
=
{
"$in"
:
memberLevel
};
const
SelectFiles
=
[
"userId"
,
"memberState"
,
"unitName"
,
"loginId"
,
"phone"
,
"joinTime"
,
"memberType"
,
"lifespanStartTime"
,
"lifespanEndTime"
];
const
SelectFiles
=
[
"userId"
,
"memberState"
,
"unitName"
,
"loginId"
,
"phone"
,
"joinTime"
,
"memberType"
,
"lifespanStartTime"
,
"lifespanEndTime"
,
"name"
];
let
dbList
=
await
findToPage
(
TABLEENUM
.
用户表
,
selectParam
,
SelectFiles
,
pageNumber
,
10
);
let
dbList
=
await
findToPage
(
TABLEENUM
.
用户表
,
selectParam
,
SelectFiles
,
pageNumber
,
10
);
let
dataCount
=
await
findCount
(
TABLEENUM
.
用户表
,
selectParam
);
let
dataCount
=
await
findCount
(
TABLEENUM
.
用户表
,
selectParam
);
let
dataList
=
[];
let
dataList
=
[];
const
itemFiles
=
[
"userId"
,
"memberState"
,
"unitName"
,
"loginId"
,
"phone"
,
"joinTime"
,
"memberType"
];
const
itemFiles
=
[
"userId"
,
"memberState"
,
"unitName"
,
"loginId"
,
"phone"
,
"joinTime"
,
"memberType"
,
"name"
];
dbList
.
forEach
(
info
=>
{
dbList
.
forEach
(
info
=>
{
let
item
:
any
=
extractData
(
info
,
itemFiles
);
let
item
:
any
=
extractData
(
info
,
itemFiles
);
item
.
lifespanTime
=
`
${
moment
(
info
.
lifespanEndTime
).
format
(
"YYYY-MM-DD"
)}
`
;
item
.
lifespanTime
=
`
${
moment
(
info
.
lifespanEndTime
).
format
(
"YYYY-MM-DD"
)}
`
;
...
@@ -425,4 +425,27 @@ export async function delGracePeriod({id}) {
...
@@ -425,4 +425,27 @@ export async function delGracePeriod({id}) {
await
updateOneData
(
TABLEENUM
.
用户表
,
{
userId
:
id
},
updateInfo
);
await
updateOneData
(
TABLEENUM
.
用户表
,
{
userId
:
id
},
updateInfo
);
return
successResult
();
return
successResult
();
}
/**
* 个人欠费周期列表
* @param param0
*/
export
async
function
memberArrearsList
({
id
})
{
/**获取用户欠费的周期列表 包含id 周期 金额 */
let
dbList
=
await
findToSort
(
TABLEENUM
.
订单表
,
{
userId
:
id
},
{
orderCycleStart
:
1
},
[
"id"
,
"orderCycleStart"
,
"orderCycleEnd"
,
"money"
]
);
let
dataList
=
[];
dbList
.
forEach
(
info
=>
{
let
{
id
,
orderCycleStart
,
orderCycleEnd
,
money
}
=
info
;
let
renewalPeriod
=
`
${
moment
(
orderCycleStart
).
format
(
"YYYY-MM-DD"
)}
-
${
moment
(
orderCycleEnd
).
format
(
"YYYY-MM-DD"
)}
`
;
dataList
.
push
({
id
,
renewalPeriod
,
money
})
});
return
{
dataList
};
}
}
\ No newline at end of file
src/biz/member/order.ts
View file @
d477dcc6
...
@@ -224,8 +224,9 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
...
@@ -224,8 +224,9 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
itemData
.
paymentMethod
=
"-"
;
itemData
.
paymentMethod
=
"-"
;
itemData
.
paymentNum
=
"-"
;
itemData
.
paymentNum
=
"-"
;
}
}
let
userInfo
=
await
findOnce
(
TABLEENUM
.
用户表
,
{
userId
:
info
.
userId
},
[
"memberState"
]);
let
userInfo
=
await
findOnce
(
TABLEENUM
.
用户表
,
{
userId
:
info
.
userId
},
[
"memberState"
,
"name"
]);
if
(
userInfo
)
itemData
.
memberState
=
changeEnumValue
(
MEMBERSTATE
,
userInfo
.
memberState
);
if
(
userInfo
)
itemData
.
memberState
=
changeEnumValue
(
MEMBERSTATE
,
userInfo
.
memberState
);
itemData
.
name
=
userInfo
.
name
;
dataList
.
push
(
itemData
);
dataList
.
push
(
itemData
);
}
}
...
@@ -360,9 +361,10 @@ export async function billStateList({name, memberType, documentId, phone, mail,
...
@@ -360,9 +361,10 @@ export async function billStateList({name, memberType, documentId, phone, mail,
itemData
.
memberType
=
changeEnumValue
(
MEMBERTYPE
,
itemData
.
memberCategory
);
itemData
.
memberType
=
changeEnumValue
(
MEMBERTYPE
,
itemData
.
memberCategory
);
itemData
.
paymentMethod
=
changeEnumValue
(
PAYMENTTYPE
,
itemData
.
paymentMethod
);
itemData
.
paymentMethod
=
changeEnumValue
(
PAYMENTTYPE
,
itemData
.
paymentMethod
);
itemData
.
isPay
=
changeEnumValue
(
ORDERSTATE
,
itemData
.
state
);
itemData
.
isPay
=
changeEnumValue
(
ORDERSTATE
,
itemData
.
state
);
let
userInfomation
=
await
findOnce
(
TABLEENUM
.
用户表
,
{
userId
:
itemData
.
userId
},
[
"userId"
,
"memberState"
]);
let
userInfomation
=
await
findOnce
(
TABLEENUM
.
用户表
,
{
userId
:
itemData
.
userId
},
[
"userId"
,
"memberState"
,
"name"
]);
itemData
.
memberState
=
changeEnumValue
(
MEMBERSTATE
,
userInfomation
.
memberState
);
itemData
.
memberState
=
changeEnumValue
(
MEMBERSTATE
,
userInfomation
.
memberState
);
itemData
.
cycle
=
`
${
moment
(
info
.
orderCycleStart
).
format
(
"YYYY-MM-DD"
)}
至
${
moment
(
info
.
orderCycleEnd
).
format
(
"YYYY-MM-DD"
)}
`
itemData
.
cycle
=
`
${
moment
(
info
.
orderCycleStart
).
format
(
"YYYY-MM-DD"
)}
至
${
moment
(
info
.
orderCycleEnd
).
format
(
"YYYY-MM-DD"
)}
`
;
itemData
.
name
=
userInfomation
.
name
;
dataList
.
push
(
itemData
);
dataList
.
push
(
itemData
);
}
}
...
@@ -479,8 +481,9 @@ export async function invoicedList({name, memberType, documentId, phone, mail, j
...
@@ -479,8 +481,9 @@ export async function invoicedList({name, memberType, documentId, phone, mail, j
itemData
.
paymentMethod
=
changeEnumValue
(
PAYMENTTYPE
,
itemData
.
paymentMethod
);
itemData
.
paymentMethod
=
changeEnumValue
(
PAYMENTTYPE
,
itemData
.
paymentMethod
);
itemData
.
cycle
=
`
${
moment
(
info
.
orderCycleStart
).
format
(
"YYYY-MM-DD"
)}
至
${
moment
(
info
.
orderCycleEnd
).
format
(
"YYYY-MM-DD"
)}
`
;
itemData
.
cycle
=
`
${
moment
(
info
.
orderCycleStart
).
format
(
"YYYY-MM-DD"
)}
至
${
moment
(
info
.
orderCycleEnd
).
format
(
"YYYY-MM-DD"
)}
`
;
itemData
.
isPay
=
changeEnumValue
(
ORDERSTATE
,
itemData
.
state
);
itemData
.
isPay
=
changeEnumValue
(
ORDERSTATE
,
itemData
.
state
);
let
userInfo
=
await
findOnce
(
TABLEENUM
.
用户表
,
{
userId
:
itemData
.
userId
},
[
"memberState"
])
let
userInfo
=
await
findOnce
(
TABLEENUM
.
用户表
,
{
userId
:
itemData
.
userId
},
[
"memberState"
,
"name"
])
itemData
.
memberState
=
changeEnumValue
(
MEMBERSTATE
,
userInfo
.
memberState
);
itemData
.
memberState
=
changeEnumValue
(
MEMBERSTATE
,
userInfo
.
memberState
);
itemData
.
name
=
userInfo
.
name
;
dataList
.
push
(
itemData
);
dataList
.
push
(
itemData
);
}
}
...
@@ -504,7 +507,7 @@ export async function transferScreenshot({id}) {
...
@@ -504,7 +507,7 @@ export async function transferScreenshot({id}) {
/**
/**
* 转账
截图、转账单号
弹窗
* 转账
发票
弹窗
* @param id 订单id
* @param id 订单id
* @returns
* @returns
*/
*/
...
...
src/routers/member/router.ts
View file @
d477dcc6
...
@@ -538,6 +538,14 @@ export const Config = {
...
@@ -538,6 +538,14 @@ export const Config = {
bindBiz
:
memberFeesBiz
.
getRenewalPeriod
bindBiz
:
memberFeesBiz
.
getRenewalPeriod
},
},
{
{
apiName
:
"欠费名单列表-欠费周期列表"
,
subUrl
:
'/memberfees/getrenewalperiod/memberarrearsrenewalperiodlist'
,
param
:[
{
key
:
"id"
,
type
:
"String"
,
desc
:
"选中用户的userid"
}
],
bindBiz
:
memberFeesBiz
.
memberArrearsList
},
{
apiName
:
"线下付款"
,
apiName
:
"线下付款"
,
subUrl
:
'/memberfees/offlinepayment'
,
subUrl
:
'/memberfees/offlinepayment'
,
param
:[
param
:[
...
...
src/routers/order/router.ts
View file @
d477dcc6
...
@@ -132,7 +132,7 @@ export const Config = {
...
@@ -132,7 +132,7 @@ export const Config = {
bindBiz
:
orderBiz
.
transferScreenshot
bindBiz
:
orderBiz
.
transferScreenshot
},
},
{
{
apiName
:
"转账
单号
弹窗"
,
apiName
:
"转账
发票
弹窗"
,
subUrl
:
'/order/invoicepop'
,
subUrl
:
'/order/invoicepop'
,
param
:[
param
:[
{
key
:
"id"
,
type
:
"String"
,
desc
:
"订单id"
},
{
key
:
"id"
,
type
:
"String"
,
desc
:
"订单id"
},
...
...
src/routers/router.ts
View file @
d477dcc6
...
@@ -26,7 +26,7 @@ export async function setRouter(httpServer){
...
@@ -26,7 +26,7 @@ export async function setRouter(httpServer){
await
getDoc
();
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(publicRouter.FirstName, publicRouter.Config, publicRouter.FirstRouter);//公用组件
await
initDoc
(
memberRouter
.
FirstName
,
memberRouter
.
Config
,
memberRouter
.
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(orderRouter.FirstName, orderRouter.Config, orderRouter.FirstRouter);//会费相关
// await initDoc(costRouter.FirstName, costRouter.Config, costRouter.FirstRouter);//支付
// await initDoc(costRouter.FirstName, costRouter.Config, costRouter.FirstRouter);//支付
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment