Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gogirl-miniapp-backend
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
huluobin
gogirl-miniapp-backend
Commits
f54447c3
Commit
f54447c3
authored
Aug 31, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
美甲师成长历程
parent
a06eaa41
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
Schedule.java
...ain/java/com/gogirl/infrastructure/schedule/Schedule.java
+5
-2
AdminFeignTest.java
.../java/com/gogirl/infrastructure/feign/AdminFeignTest.java
+1
-1
No files found.
src/main/java/com/gogirl/infrastructure/schedule/Schedule.java
View file @
f54447c3
...
@@ -29,6 +29,7 @@ import com.gogirl.infrastructure.common.config.property.GogirlProperties;
...
@@ -29,6 +29,7 @@ import com.gogirl.infrastructure.common.config.property.GogirlProperties;
import
com.gogirl.infrastructure.common.util.DateUtils
;
import
com.gogirl.infrastructure.common.util.DateUtils
;
import
com.gogirl.infrastructure.common.util.JsonUtilByJackson
;
import
com.gogirl.infrastructure.common.util.JsonUtilByJackson
;
import
com.gogirl.infrastructure.common.util.ListUtil
;
import
com.gogirl.infrastructure.common.util.ListUtil
;
import
com.gogirl.infrastructure.feign.AdminFeign
;
import
com.gogirl.infrastructure.mapper.common.xcx.WeekConfigMapper
;
import
com.gogirl.infrastructure.mapper.common.xcx.WeekConfigMapper
;
import
com.gogirl.infrastructure.mapper.market.coupon.CouponCustomerRelevanceMapper
;
import
com.gogirl.infrastructure.mapper.market.coupon.CouponCustomerRelevanceMapper
;
import
com.gogirl.infrastructure.mapper.market.discount.LeisureDiscountConfigLimitMapper
;
import
com.gogirl.infrastructure.mapper.market.discount.LeisureDiscountConfigLimitMapper
;
...
@@ -130,6 +131,8 @@ public class Schedule {
...
@@ -130,6 +131,8 @@ public class Schedule {
private
final
RestTemplate
restTemplate
;
private
final
RestTemplate
restTemplate
;
private
final
IRecentDeductedComplaintScoreService
recentDeductedComplaintScoreService
;
private
final
IRecentDeductedComplaintScoreService
recentDeductedComplaintScoreService
;
private
final
AdminFeign
adminFeign
;
/**
/**
* 每天3点判断优惠券是否过期。
* 每天3点判断优惠券是否过期。
*/
*/
...
@@ -242,7 +245,6 @@ public class Schedule {
...
@@ -242,7 +245,6 @@ public class Schedule {
pushMsgService
.
sendScheduleMsg
(
customer
.
getOpenid1
(),
scheduleServeList
.
get
(
0
).
getServeName
(),
scheduleManage
.
getArriveTime
(),
storeManage
.
getName
(),
storeManage
.
getAddress
());
pushMsgService
.
sendScheduleMsg
(
customer
.
getOpenid1
(),
scheduleServeList
.
get
(
0
).
getServeName
(),
scheduleManage
.
getArriveTime
(),
storeManage
.
getName
(),
storeManage
.
getAddress
());
/*美甲师超时预约提醒*/
/*美甲师超时预约提醒*/
scheduleManage
.
setIsSend
(
1
);
scheduleManage
.
setIsSend
(
1
);
scheduleManageMapper
.
updateById
(
scheduleManage
);
scheduleManageMapper
.
updateById
(
scheduleManage
);
...
@@ -420,6 +422,7 @@ public class Schedule {
...
@@ -420,6 +422,7 @@ public class Schedule {
.
sord
(
"asc"
)
.
sord
(
"asc"
)
//在职
//在职
.
status
(
1
)
.
status
(
1
)
.
date_utc
(
Lists
.
newArrayList
(
LocalDateTime
.
of
(
LocalDate
.
of
(
2018
,
1
,
1
),
LocalTime
.
of
(
0
,
0
)).
toString
(),
LocalDateTime
.
now
().
toString
()))
.
technician_id
(
storeTechnician
.
getId
())
.
technician_id
(
storeTechnician
.
getId
())
.
build
();
.
build
();
HttpHeaders
headers
=
new
HttpHeaders
();
HttpHeaders
headers
=
new
HttpHeaders
();
...
@@ -554,7 +557,7 @@ public class Schedule {
...
@@ -554,7 +557,7 @@ public class Schedule {
try
{
try
{
consumer
.
accept
(
storeTechnician
);
consumer
.
accept
(
storeTechnician
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"
同步美甲师成长任务失败,id:{},name:{}"
,
storeTechnician
.
getId
(),
storeTechnician
.
getName
()
);
log
.
error
(
"
{},同步美甲师成长任务失败,id:{},name:{}"
,
e
.
getMessage
(),
storeTechnician
.
getId
(),
storeTechnician
.
getName
(),
e
);
}
}
});
});
...
...
src/test/java/com/gogirl/infrastructure/feign/AdminFeignTest.java
View file @
f54447c3
...
@@ -129,7 +129,7 @@ public class AdminFeignTest {
...
@@ -129,7 +129,7 @@ public class AdminFeignTest {
//在职
//在职
.
status
(
1
)
.
status
(
1
)
.
build
();
.
build
();
request
.
setDate_utc
(
Lists
.
newArrayList
(
ZonedDateTime
.
of
(
LocalDateTime
.
of
(
20
20
,
6
,
30
,
0
,
0
),
ZoneOffset
.
UTC
).
toString
(),
request
.
setDate_utc
(
Lists
.
newArrayList
(
ZonedDateTime
.
of
(
LocalDateTime
.
of
(
20
18
,
6
,
30
,
0
,
0
),
ZoneOffset
.
UTC
).
toString
(),
ZonedDateTime
.
of
(
LocalDateTime
.
of
(
2020
,
7
,
30
,
0
,
0
),
ZoneOffset
.
UTC
).
toString
()));
ZonedDateTime
.
of
(
LocalDateTime
.
of
(
2020
,
7
,
30
,
0
,
0
),
ZoneOffset
.
UTC
).
toString
()));
AdminResult
<
AdminPage
<
AdminTechnicianScoreResp
>>
result
=
adminFeign
.
getTechnicianPage
(
request
);
AdminResult
<
AdminPage
<
AdminTechnicianScoreResp
>>
result
=
adminFeign
.
getTechnicianPage
(
request
);
...
...
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