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
92e6d3dc
Commit
92e6d3dc
authored
Sep 13, 2024
by
吕明尚
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
会员的过期时间改成获取参数
parent
d0a6f0cf
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
7 deletions
+5
-7
CallbackController.java
.../java/share/web/controller/system/CallbackController.java
+0
-2
RedisTask.java
share-quartz/src/main/java/share/quartz/task/RedisTask.java
+1
-1
ConsumerWalletServiceImpl.java
.../share/system/service/impl/ConsumerWalletServiceImpl.java
+1
-1
EquityMembersOrderServiceImpl.java
...re/system/service/impl/EquityMembersOrderServiceImpl.java
+2
-2
RechargeServiceImpl.java
...n/java/share/system/service/impl/RechargeServiceImpl.java
+1
-1
No files found.
share-admin/src/main/java/share/web/controller/system/CallbackController.java
View file @
92e6d3dc
...
@@ -12,8 +12,6 @@ import share.system.domain.vo.SaobeiNotifyResponseVo;
...
@@ -12,8 +12,6 @@ import share.system.domain.vo.SaobeiNotifyResponseVo;
import
share.system.domain.vo.SaobeiNotifyVo
;
import
share.system.domain.vo.SaobeiNotifyVo
;
import
share.system.service.CallbackService
;
import
share.system.service.CallbackService
;
import
javax.servlet.http.HttpServletRequest
;
/**
/**
* 支付回调
* 支付回调
...
...
share-quartz/src/main/java/share/quartz/task/RedisTask.java
View file @
92e6d3dc
...
@@ -668,7 +668,7 @@ public class RedisTask {
...
@@ -668,7 +668,7 @@ public class RedisTask {
if
(
ObjectUtil
.
isNotEmpty
(
consumerMember
))
{
if
(
ObjectUtil
.
isNotEmpty
(
consumerMember
))
{
if
(
consumerMember
.
getIsRecharge
().
equals
(
YesNoEnum
.
yes
.
getIndex
()))
{
if
(
consumerMember
.
getIsRecharge
().
equals
(
YesNoEnum
.
yes
.
getIndex
()))
{
String
rechargeMembershipExpirationTime
=
sysConfigService
.
selectConfigByKey
(
"rechargeMembershipExpirationTime"
);
String
rechargeMembershipExpirationTime
=
sysConfigService
.
selectConfigByKey
(
"rechargeMembershipExpirationTime"
);
consumerMember
.
setExpirationDate
(
DateUtils
.
addYears
(
new
Date
(),
Integer
.
getInteger
(
rechargeMembershipExpirationTime
)));
consumerMember
.
setExpirationDate
(
DateUtils
.
addYears
(
new
Date
(),
Integer
.
parseInt
(
rechargeMembershipExpirationTime
)));
}
}
// MemberConfig memberConfigServiceOne = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>()
// MemberConfig memberConfigServiceOne = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>()
//// .eq(MemberConfig::getMemberType, consumerMember.getMemberType())
//// .eq(MemberConfig::getMemberType, consumerMember.getMemberType())
...
...
share-system/src/main/java/share/system/service/impl/ConsumerWalletServiceImpl.java
View file @
92e6d3dc
...
@@ -213,7 +213,7 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
...
@@ -213,7 +213,7 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
// .eq(MemberConfig::getMemberType, MemberTypeEnum.RECHARGE.getIndex())
// .eq(MemberConfig::getMemberType, MemberTypeEnum.RECHARGE.getIndex())
// );
// );
String
expirationDateEquityMembership
=
sysConfigService
.
selectConfigByKey
(
"expirationDateEquityMembership"
);
String
expirationDateEquityMembership
=
sysConfigService
.
selectConfigByKey
(
"expirationDateEquityMembership"
);
one
.
setExpirationDate
(
DateUtils
.
addYears
(
new
Date
(),
Integer
.
getInteger
(
expirationDateEquityMembership
)));
one
.
setExpirationDate
(
DateUtils
.
addYears
(
new
Date
(),
Integer
.
parseInt
(
expirationDateEquityMembership
)));
}
}
logger
.
debug
(
"修改会员用户"
);
logger
.
debug
(
"修改会员用户"
);
...
...
share-system/src/main/java/share/system/service/impl/EquityMembersOrderServiceImpl.java
View file @
92e6d3dc
...
@@ -214,7 +214,7 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
...
@@ -214,7 +214,7 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
//在原来的基础上增加有效期
//在原来的基础上增加有效期
consumerMember
.
setExpirationDate
(
DateUtils
.
addYears
(
DateUtils
.
parseDate
(
DateUtils
.
parseDateToStr
(
DateUtils
.
YYYY_MM_DD_HH_MM
,
consumerMember
.
getExpirationDate
())),
consumerMember
.
setExpirationDate
(
DateUtils
.
addYears
(
DateUtils
.
parseDate
(
DateUtils
.
parseDateToStr
(
DateUtils
.
YYYY_MM_DD_HH_MM
,
consumerMember
.
getExpirationDate
())),
Integer
.
getInteger
(
expirationDateEquityMembership
)));
Integer
.
parseInt
(
expirationDateEquityMembership
)));
extracted
(
equityMembersOrder
,
equityMembersOrderConfig
,
consumerMember
,
consumerWallet
,
memberConfigServiceOne
);
extracted
(
equityMembersOrder
,
equityMembersOrderConfig
,
consumerMember
,
consumerWallet
,
memberConfigServiceOne
);
consumerMemberService
.
updateConsumerMember
(
consumerMember
);
consumerMemberService
.
updateConsumerMember
(
consumerMember
);
logger
.
debug
(
"权益会员原来的基础上增加有效期"
);
logger
.
debug
(
"权益会员原来的基础上增加有效期"
);
...
@@ -224,7 +224,7 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
...
@@ -224,7 +224,7 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
// consumerMember.setMemberType(MemberTypeEnum.RIGHTS.getIndex());
// consumerMember.setMemberType(MemberTypeEnum.RIGHTS.getIndex());
// consumerMember.setMemberConfigId(memberConfigServiceOne.getId());
// consumerMember.setMemberConfigId(memberConfigServiceOne.getId());
consumerMember
.
setExpirationDate
(
DateUtils
.
addYears
(
DateUtils
.
parseDate
(
DateUtils
.
parseDateToStr
(
DateUtils
.
YYYY_MM_DD_HH_MM
,
new
Date
())),
consumerMember
.
setExpirationDate
(
DateUtils
.
addYears
(
DateUtils
.
parseDate
(
DateUtils
.
parseDateToStr
(
DateUtils
.
YYYY_MM_DD_HH_MM
,
new
Date
())),
Integer
.
getInteger
(
expirationDateEquityMembership
)));
Integer
.
parseInt
(
expirationDateEquityMembership
)));
extracted
(
equityMembersOrder
,
equityMembersOrderConfig
,
consumerMember
,
consumerWallet
,
memberConfigServiceOne
);
extracted
(
equityMembersOrder
,
equityMembersOrderConfig
,
consumerMember
,
consumerWallet
,
memberConfigServiceOne
);
consumerMemberService
.
updateConsumerMember
(
consumerMember
);
consumerMemberService
.
updateConsumerMember
(
consumerMember
);
logger
.
debug
(
"修改会员类型为权益会员"
);
logger
.
debug
(
"修改会员类型为权益会员"
);
...
...
share-system/src/main/java/share/system/service/impl/RechargeServiceImpl.java
View file @
92e6d3dc
...
@@ -167,7 +167,7 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
...
@@ -167,7 +167,7 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
// consumerMember.setMemberConfigId(memberConfig.getId());
// consumerMember.setMemberConfigId(memberConfig.getId());
consumerMember
.
setMembershipProgress
(
BigDecimal
.
ZERO
);
consumerMember
.
setMembershipProgress
(
BigDecimal
.
ZERO
);
String
rechargeMembershipExpirationTime
=
sysConfigService
.
selectConfigByKey
(
"rechargeMembershipExpirationTime"
);
String
rechargeMembershipExpirationTime
=
sysConfigService
.
selectConfigByKey
(
"rechargeMembershipExpirationTime"
);
consumerMember
.
setExpirationDate
(
DateUtils
.
addYears
(
new
Date
(),
Integer
.
getInteger
(
rechargeMembershipExpirationTime
)));
consumerMember
.
setExpirationDate
(
DateUtils
.
addYears
(
new
Date
(),
Integer
.
parseInt
(
rechargeMembershipExpirationTime
)));
consumerMember
.
setCreateTime
(
new
Date
());
consumerMember
.
setCreateTime
(
new
Date
());
consumerMember
.
setIsRecharge
(
YesNoEnum
.
yes
.
getIndex
());
consumerMember
.
setIsRecharge
(
YesNoEnum
.
yes
.
getIndex
());
consumerMemberService
.
save
(
consumerMember
);
consumerMemberService
.
save
(
consumerMember
);
...
...
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