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
89f8a7d3
Commit
89f8a7d3
authored
May 06, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
发券data fix
parent
ec486450
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
3 deletions
+21
-3
CouponCustomerRelevanceMapper.java
...e/mapper/market/coupon/CouponCustomerRelevanceMapper.java
+3
-0
TakeLeaveEventController.java
...interfaces/store/attendance/TakeLeaveEventController.java
+1
-1
CouponCustomerRelevanceMapper.xml
...resources/mapper/market/CouponCustomerRelevanceMapper.xml
+3
-0
Test.java
src/test/java/com/gogirl/Test.java
+14
-2
No files found.
src/main/java/com/gogirl/infrastructure/mapper/market/coupon/CouponCustomerRelevanceMapper.java
View file @
89f8a7d3
...
@@ -38,4 +38,7 @@ public interface CouponCustomerRelevanceMapper extends BaseMapper<CouponCustomer
...
@@ -38,4 +38,7 @@ public interface CouponCustomerRelevanceMapper extends BaseMapper<CouponCustomer
List
<
Integer
>
queryCouponCustomerServeRelevance
(
Integer
couponId
);
List
<
Integer
>
queryCouponCustomerServeRelevance
(
Integer
couponId
);
List
<
CouponCustomerRelevance
>
selectByOrderTimes
();
List
<
CouponCustomerRelevance
>
selectByOrderTimes
();
List
<
CouponCustomerRelevance
>
couponCustomerRelevanceError
();
}
}
src/main/java/com/gogirl/interfaces/store/attendance/TakeLeaveEventController.java
View file @
89f8a7d3
...
@@ -77,7 +77,7 @@ public class TakeLeaveEventController {
...
@@ -77,7 +77,7 @@ public class TakeLeaveEventController {
return
JsonResult
.
success
();
return
JsonResult
.
success
();
}
}
@ApiOperation
(
"/总后台
驳回
请假"
)
@ApiOperation
(
"/总后台
审批
请假"
)
@PostMapping
(
"/admin/takeLeave/adminRefuseTakeLeaveEvent/{takeLeaveEventId}"
)
@PostMapping
(
"/admin/takeLeave/adminRefuseTakeLeaveEvent/{takeLeaveEventId}"
)
public
JsonResult
<
Void
>
adminRefuseTakeLeaveEvent
(
@PathVariable
Integer
takeLeaveEventId
)
{
public
JsonResult
<
Void
>
adminRefuseTakeLeaveEvent
(
@PathVariable
Integer
takeLeaveEventId
)
{
takeLeaveEventCmdService
.
adminRefuseTakeLeaveEvent
(
takeLeaveEventId
);
takeLeaveEventCmdService
.
adminRefuseTakeLeaveEvent
(
takeLeaveEventId
);
...
...
src/main/resources/mapper/market/CouponCustomerRelevanceMapper.xml
View file @
89f8a7d3
...
@@ -31,6 +31,9 @@
...
@@ -31,6 +31,9 @@
where t2.finish_time > '2020-01-01'
where t2.finish_time > '2020-01-01'
and t1.state = 2
and t1.state = 2
</select>
</select>
<select
id=
"couponCustomerRelevanceError"
resultType=
"com.gogirl.domain.market.coupon.CouponCustomerRelevance"
>
select * from coupon_customer_relevance where valid_end_time
<
valid_start_time and state =3
</select>
<update
id=
"setCouponExpire"
parameterType=
"java.util.Date"
>
<update
id=
"setCouponExpire"
parameterType=
"java.util.Date"
>
update coupon_customer_relevance
update coupon_customer_relevance
...
...
src/test/java/com/gogirl/Test.java
View file @
89f8a7d3
...
@@ -480,7 +480,7 @@ public class Test {
...
@@ -480,7 +480,7 @@ public class Test {
@org
.
junit
.
Test
@org
.
junit
.
Test
public
void
testMail
()
{
public
void
testMail
()
{
mailService
.
sendSimpleMail
(
"robbendev@qq.com"
,
"pre"
,
"test"
);
mailService
.
sendSimpleMail
(
"robbendev@qq.com"
,
"pre"
,
"test"
);
}
}
...
@@ -488,7 +488,19 @@ public class Test {
...
@@ -488,7 +488,19 @@ public class Test {
Schedule
schedule
;
Schedule
schedule
;
@org
.
junit
.
Test
@org
.
junit
.
Test
public
void
career
(){
public
void
career
()
{
schedule
.
syncTechnicianCareer
();
schedule
.
syncTechnicianCareer
();
}
}
@org
.
junit
.
Test
public
void
couponCustomerRelevanceError
()
{
List
<
CouponCustomerRelevance
>
couponCustomerRelevanceList
=
couponCustomerRelevanceMapper
.
couponCustomerRelevanceError
();
couponCustomerRelevanceList
.
forEach
(
couponCustomerRelevance
->
{
couponCustomerRelevance
.
setValidEndTime
(
new
Date
(
couponCustomerRelevance
.
getValidStartTime
().
getTime
()
+
30
*
24
*
60
*
60
*
1000L
));
if
(
couponCustomerRelevance
.
isValid
())
{
couponCustomerRelevance
.
setState
(
1
);
}
couponCustomerRelevanceMapper
.
updateById
(
couponCustomerRelevance
);
});
}
}
}
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