Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fit-finance
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fitness-server
fit-finance
Commits
e3f81feb
Commit
e3f81feb
authored
Apr 08, 2024
by
程裕兵
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:enum error
parent
d1895f33
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
6 deletions
+13
-6
repository/src/main/java/com/jiejing/fitness/finance/repository/service/StudioCashierRecordRpService.java
+3
-3
repository/src/main/java/com/jiejing/fitness/finance/repository/service/StudioMerchantApplyRpService.java
+10
-3
No files found.
repository/src/main/java/com/jiejing/fitness/finance/repository/service/StudioCashierRecordRpService.java
View file @
e3f81feb
...
...
@@ -71,16 +71,16 @@ public class StudioCashierRecordRpService extends
wrapper
.
eq
(
StudioCashierRecord
.
BUYER_NAME
,
query
.
getBuyerName
());
}
if
(
null
!=
query
.
getTransState
())
{
wrapper
.
eq
(
StudioCashierRecord
.
TRANS_STATE
,
query
.
getTransState
());
wrapper
.
eq
(
StudioCashierRecord
.
TRANS_STATE
,
query
.
getTransState
()
.
getCode
()
);
}
if
(
null
!=
query
.
getOrderType
())
{
wrapper
.
eq
(
StudioCashierRecord
.
ORDER_TYPE
,
query
.
getOrderType
().
getCode
());
}
if
(
null
!=
query
.
getTransType
())
{
wrapper
.
eq
(
StudioCashierRecord
.
TRANS_TYPE
,
query
.
getTransType
());
wrapper
.
eq
(
StudioCashierRecord
.
TRANS_TYPE
,
query
.
getTransType
()
.
getCode
()
);
}
if
(
null
!=
query
.
getSubChannel
())
{
wrapper
.
eq
(
StudioCashierRecord
.
SUB_CHANNEL
,
query
.
getSubChannel
());
wrapper
.
eq
(
StudioCashierRecord
.
SUB_CHANNEL
,
query
.
getSubChannel
()
.
getCode
()
);
}
if
(
null
!=
query
.
getCreateStartTime
())
{
wrapper
.
ge
(
StudioCashierRecord
.
CREATE_TIME
,
query
.
getCreateStartTime
());
...
...
repository/src/main/java/com/jiejing/fitness/finance/repository/service/StudioMerchantApplyRpService.java
View file @
e3f81feb
...
...
@@ -45,25 +45,32 @@ import org.springframework.stereotype.Service;
public
class
StudioMerchantApplyRpService
extends
MapperRepoService
<
Long
,
StudioMerchantApply
,
StudioMerchantApplyMapper
>
{
private
List
<
String
>
convertApplyTypeList
(
List
<
ApplyTypeEnum
>
applyTypeList
)
{
if
(
CollectionUtil
.
isEmpty
(
applyTypeList
))
{
return
null
;
}
return
applyTypeList
.
stream
().
map
(
ApplyTypeEnum:
:
getCode
).
collect
(
Collectors
.
toList
());
}
public
Page
<
StudioMerchantApply
>
page
(
PageStudioMerchantApplyQuery
params
)
{
QueryWrapper
<
StudioMerchantApply
>
wrapper
=
new
QueryWrapper
<>();
if
(
StringUtil
.
isNotBlank
(
params
.
getShortName
()))
{
wrapper
.
like
(
StudioMerchantApply
.
SHORT_NAME
,
params
.
getShortName
());
}
if
(
CollectionUtil
.
isNotEmpty
(
params
.
getApplyTypeList
()))
{
wrapper
.
in
(
StudioMerchantApply
.
APPLY_TYPE
,
params
.
getApplyTypeList
(
));
wrapper
.
in
(
StudioMerchantApply
.
APPLY_TYPE
,
convertApplyTypeList
(
params
.
getApplyTypeList
()
));
}
if
(
null
!=
params
.
getStudioId
())
{
wrapper
.
eq
(
StudioMerchantApply
.
STUDIO_ID
,
params
.
getStudioId
());
}
if
(
null
!=
params
.
getCompanyType
())
{
wrapper
.
eq
(
StudioMerchantApply
.
COMPANY_TYPE
,
params
.
getCompanyType
());
wrapper
.
eq
(
StudioMerchantApply
.
COMPANY_TYPE
,
params
.
getCompanyType
()
.
getCode
()
);
}
if
(
StringUtil
.
isNotBlank
(
params
.
getMerchantName
()))
{
wrapper
.
like
(
StudioMerchantApply
.
MERCHANT_NAME
,
params
.
getMerchantName
());
}
if
(
null
!=
params
.
getOpenState
())
{
wrapper
.
eq
(
StudioMerchantApply
.
OPEN_STATE
,
params
.
getOpenState
());
wrapper
.
eq
(
StudioMerchantApply
.
OPEN_STATE
,
params
.
getOpenState
()
.
getCode
()
);
}
if
(
StringUtil
.
isNotBlank
(
params
.
getMerchantNo
()))
{
wrapper
.
eq
(
StudioMerchantApply
.
MERCHANT_NO
,
params
.
getMerchantNo
());
...
...
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