Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
向汉
/
uc-engine
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
Commit
260caab0
...
260caab0edb0cc32974f519b77e8506119796749
authored
2022-08-12 14:22:53 +0800
by
xianghan
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
1.删除发放权益时注释的代码
2.修改本周一和本周日的日期生成逻辑
1 parent
38088726
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
21 deletions
member-service-impl/src/main/java/com/topdraw/business/process/service/impl/RightsOperationServiceImpl.java
member-service-impl/src/main/java/com/topdraw/util/DateUtil.java
member-service-impl/src/main/java/com/topdraw/business/process/service/impl/RightsOperationServiceImpl.java
View file @
260caab
...
...
@@ -141,7 +141,6 @@ public class RightsOperationServiceImpl implements RightsOperationService {
this
.
grantPoint
(
tempPointsList
);
log
.
info
(
"发放积分结束 ==>> {}"
,
tempPointsList
);
}
// });
List
<
TempExp
>
tempExpList
=
(
List
<
TempExp
>)
tempRightsMap
.
get
(
RightType
.
EXP
);
if
(!
CollectionUtils
.
isEmpty
(
tempExpList
))
{
...
...
@@ -151,18 +150,6 @@ public class RightsOperationServiceImpl implements RightsOperationService {
log
.
info
(
"发放成长值结束 ==>> "
);
}
// this.threadPoolTaskExecutor.submit(() -> {
/*List<TempCoupon> tempCouponList = (List<TempCoupon>) tempRightsMap.get(RightType.COUPON);
if (!CollectionUtils.isEmpty(tempCouponList)) {
// log.info("发放优惠券开始 ==>> [{}]", tempCouponList);
long l = System.currentTimeMillis();
// 优惠券
this.grantCoupon(tempCouponList);
long l2 = System.currentTimeMillis();
log.info("发放优惠券结束,总耗时 ==>> {}", (l2 - l));
}*/
// });
// 其他权益
this
.
grantOtherRight
(
tempRightsMap
);
log
.
info
(
"发放其他权益结束 ==>>"
);
...
...
member-service-impl/src/main/java/com/topdraw/util/DateUtil.java
View file @
260caab
package
com
.
topdraw
.
util
;
import
java.text.SimpleDateFormat
;
import
java.time.Instant
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
import
java.time.ZoneId
;
import
java.time.*
;
import
java.time.temporal.TemporalAdjusters
;
import
java.time.temporal.TemporalUnit
;
import
java.util.Calendar
;
import
java.util.Date
;
import
java.util.TimeZone
;
...
...
@@ -180,9 +179,9 @@ public class DateUtil {
Calendar
calendar1
=
Calendar
.
getInstance
();
calendar1
.
set
(
Calendar
.
DAY_OF_WEEK
,
Calendar
.
SU
NDAY
);
calendar1
.
set
(
Calendar
.
DAY_OF_WEEK
,
Calendar
.
MO
NDAY
);
System
.
out
.
println
(
"本周
日
: "
+
sdf
.
format
(
calendar1
.
getTime
()));
System
.
out
.
println
(
"本周
一
: "
+
sdf
.
format
(
calendar1
.
getTime
()));
return
sdf
.
format
(
calendar1
.
getTime
());
}
...
...
@@ -192,8 +191,8 @@ public class DateUtil {
Calendar
calendar1
=
Calendar
.
getInstance
();
calendar1
.
set
(
Calendar
.
DAY_OF_WEEK
,
Calendar
.
SATURDAY
);
System
.
out
.
println
(
"本周
六
: "
+
sdf
.
format
(
calendar1
.
getTime
()));
calendar1
.
add
(
Calendar
.
DAY_OF_MONTH
,
1
);
System
.
out
.
println
(
"本周
日
: "
+
sdf
.
format
(
calendar1
.
getTime
()));
return
sdf
.
format
(
calendar1
.
getTime
());
}
...
...
Please
register
or
sign in
to post a comment