Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gxpt_ht
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
pseer
gxpt_ht
Commits
e39ce733
Commit
e39ce733
authored
Jul 31, 2024
by
吕明尚
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改支付回调
parent
4c519e34
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
7 deletions
+8
-7
RedisTask.java
share-quartz/src/main/java/share/quartz/task/RedisTask.java
+1
-1
ConsumerMember.java
...tem/src/main/java/share/system/domain/ConsumerMember.java
+1
-1
ConsumerWalletServiceImpl.java
.../share/system/service/impl/ConsumerWalletServiceImpl.java
+1
-1
EquityMembersOrderServiceImpl.java
...re/system/service/impl/EquityMembersOrderServiceImpl.java
+2
-1
RechargeServiceImpl.java
...n/java/share/system/service/impl/RechargeServiceImpl.java
+2
-2
SOrderServiceImpl.java
...ain/java/share/system/service/impl/SOrderServiceImpl.java
+1
-1
No files found.
share-quartz/src/main/java/share/quartz/task/RedisTask.java
View file @
e39ce733
...
...
@@ -510,7 +510,7 @@ public class RedisTask {
Long
consumerId
=
jsonObject
.
getLong
(
"consumerId"
);
if
(
expirationTime
.
getTime
()
<
new
Date
().
getTime
())
{
ConsumerMember
consumerMember
=
consumerMemberService
.
getOne
(
new
LambdaQueryWrapper
<
ConsumerMember
>().
eq
(
ConsumerMember:
:
getConsumerId
,
consumerId
));
consumerMember
.
setIsRight
(
YesNoEnum
.
no
.
getIndex
());
consumerMember
.
setIsRight
s
(
YesNoEnum
.
no
.
getIndex
());
if
(
ObjectUtil
.
isNotEmpty
(
consumerMember
))
{
if
(
consumerMember
.
getIsRecharge
().
equals
(
YesNoEnum
.
yes
.
getIndex
()))
{
consumerMember
.
setMemberType
(
MemberTypeEnum
.
RECHARGE
.
getIndex
());
...
...
share-system/src/main/java/share/system/domain/ConsumerMember.java
View file @
e39ce733
...
...
@@ -71,7 +71,7 @@ public class ConsumerMember extends BaseEntity {
/**
* 是否为权益
*/
private
Integer
isRight
;
private
Integer
isRight
s
;
/**
* 是否删除
...
...
share-system/src/main/java/share/system/service/impl/ConsumerWalletServiceImpl.java
View file @
e39ce733
...
...
@@ -178,7 +178,7 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
BigDecimal
divide
=
new
BigDecimal
(
0
);
RechargeConf
rechargeConf
=
rechargeConfService
.
selectRechargeConfById
(
recharge
.
getRechargeConfId
());
MemberConfig
memberConfig
=
memberConfigService
.
getOne
(
new
LambdaQueryWrapper
<
MemberConfig
>()
.
eq
(
MemberConfig:
:
getMembershipLevel
,
1L
)
.
eq
(
MemberConfig:
:
getMembershipLevel
,
one
.
getMembershipLevel
()
)
.
eq
(
MemberConfig:
:
getMemberType
,
MemberTypeEnum
.
RECHARGE
.
getIndex
()));
one
.
setExpirationDate
(
DateUtils
.
addYears
(
new
Date
(),
memberConfig
.
getValidityPeriod
().
intValue
()));
logger
.
debug
(
"修改会员用户"
);
...
...
share-system/src/main/java/share/system/service/impl/EquityMembersOrderServiceImpl.java
View file @
e39ce733
...
...
@@ -161,7 +161,7 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
equityMembersOrderConfig
.
getValidityPeriod
().
intValue
()));
newConsumerMember
.
setMembershipProgress
(
BigDecimal
.
ZERO
);
newConsumerMember
.
setCreateTime
(
new
Date
());
newConsumerMember
.
setIsRight
(
YesNoEnum
.
yes
.
getIndex
());
newConsumerMember
.
setIsRight
s
(
YesNoEnum
.
yes
.
getIndex
());
consumerMemberService
.
save
(
newConsumerMember
);
logger
.
debug
(
"新增权益会员"
);
Map
<
String
,
String
>
map
=
new
HashMap
<>();
...
...
@@ -179,6 +179,7 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
consumerMemberService
.
updateConsumerMember
(
consumerMember
);
logger
.
debug
(
"权益会员原来的基础上增加有效期"
);
}
else
{
consumerMember
.
setIsRights
(
YesNoEnum
.
yes
.
getIndex
());
//修改会员类型为权益会员
consumerMember
.
setMemberType
(
MemberTypeEnum
.
RIGHTS
.
getIndex
());
consumerMember
.
setMemberConfigId
(
memberConfigService
.
getOne
(
new
LambdaQueryWrapper
<
MemberConfig
>()
...
...
share-system/src/main/java/share/system/service/impl/RechargeServiceImpl.java
View file @
e39ce733
...
...
@@ -155,10 +155,10 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
//新增会员
ConsumerMember
consumerMember
=
new
ConsumerMember
();
consumerMember
.
setConsumerId
(
recharge
.
getConsumerId
());
consumerMember
.
setMembershipLevel
(
1
L
);
consumerMember
.
setMembershipLevel
(
0
L
);
consumerMember
.
setMemberType
(
MemberTypeEnum
.
RECHARGE
.
getIndex
());
MemberConfig
memberConfig
=
memberConfigService
.
getOne
(
new
LambdaQueryWrapper
<
MemberConfig
>()
.
eq
(
MemberConfig:
:
getMembershipLevel
,
1
L
)
.
eq
(
MemberConfig:
:
getMembershipLevel
,
0
L
)
.
eq
(
MemberConfig:
:
getMemberType
,
MemberTypeEnum
.
RECHARGE
.
getIndex
()));
consumerMember
.
setMemberConfigId
(
memberConfig
.
getId
());
consumerMember
.
setMembershipProgress
(
BigDecimal
.
ZERO
);
...
...
share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java
View file @
e39ce733
...
...
@@ -1146,7 +1146,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
consumerMember
.
setMembershipLevel
(
consumerMember
.
getMembershipLevel
()
+
1L
);
consumerMember
.
setMemberConfigId
(
one
.
getId
());
}
}
else
if
(
consumerMember
.
getIsRight
().
equals
(
YesNoEnum
.
yes
.
getIndex
()))
{
}
else
if
(
consumerMember
.
getIsRight
s
().
equals
(
YesNoEnum
.
yes
.
getIndex
()))
{
consumerMember
.
setMemberType
(
MemberTypeEnum
.
RIGHTS
.
getIndex
());
MemberConfig
one
=
memberConfigService
.
getOne
(
new
LambdaQueryWrapper
<
MemberConfig
>()
.
eq
(
MemberConfig:
:
getMemberType
,
consumerMember
.
getMemberType
())
...
...
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