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
8c53c08d
Commit
8c53c08d
authored
Oct 27, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
冲送info
parent
35d44f5e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
41 additions
and
3 deletions
+41
-3
TakeLeaveEventCmdService.java
...irl/application/store/store/TakeLeaveEventCmdService.java
+1
-1
TakeLeaveEventCmdServiceImpl.java
...cation/store/store/impl/TakeLeaveEventCmdServiceImpl.java
+3
-1
DiscountConfig.java
...ava/com/gogirl/domain/market/discount/DiscountConfig.java
+2
-0
TakeLeaveEventController.java
.../gogirl/interfaces/store/oa/TakeLeaveEventController.java
+1
-1
TakeLeaveEventCmdServiceImplTest.java
...on/store/store/impl/TakeLeaveEventCmdServiceImplTest.java
+34
-0
No files found.
src/main/java/com/gogirl/application/store/store/TakeLeaveEventCmdService.java
View file @
8c53c08d
...
@@ -55,5 +55,5 @@ public interface TakeLeaveEventCmdService {
...
@@ -55,5 +55,5 @@ public interface TakeLeaveEventCmdService {
*
*
* @param takeLeaveEventId
* @param takeLeaveEventId
*/
*/
void
adminRefuseTakeLeaveEvent
(
Integer
takeLeaveEventId
);
void
adminRefuseTakeLeaveEvent
(
Long
takeLeaveEventId
);
}
}
src/main/java/com/gogirl/application/store/store/impl/TakeLeaveEventCmdServiceImpl.java
View file @
8c53c08d
...
@@ -260,9 +260,11 @@ public class TakeLeaveEventCmdServiceImpl implements TakeLeaveEventCmdService {
...
@@ -260,9 +260,11 @@ public class TakeLeaveEventCmdServiceImpl implements TakeLeaveEventCmdService {
}
}
@Override
@Override
public
void
adminRefuseTakeLeaveEvent
(
Integer
takeLeaveEventId
)
{
public
void
adminRefuseTakeLeaveEvent
(
Long
takeLeaveEventId
)
{
TakeLeaveEvent
takeLeaveEvent
=
takeLeaveEventRepository
.
selectById
(
takeLeaveEventId
);
TakeLeaveEvent
takeLeaveEvent
=
takeLeaveEventRepository
.
selectById
(
takeLeaveEventId
);
takeLeaveEvent
//如果是通过的加班申请被驳回
//如果是通过的加班申请被驳回
if
(
takeLeaveEvent
.
getType
().
equals
(
TakeLeaveEvent
.
TYPE_OVER_TIME
)
&&
if
(
takeLeaveEvent
.
getType
().
equals
(
TakeLeaveEvent
.
TYPE_OVER_TIME
)
&&
takeLeaveEvent
.
getStatus
().
equals
(
TakeLeaveEvent
.
STATUS_APPROVAL_PASS
))
{
takeLeaveEvent
.
getStatus
().
equals
(
TakeLeaveEvent
.
STATUS_APPROVAL_PASS
))
{
...
...
src/main/java/com/gogirl/domain/market/discount/DiscountConfig.java
View file @
8c53c08d
...
@@ -37,4 +37,6 @@ public class DiscountConfig implements Serializable {
...
@@ -37,4 +37,6 @@ public class DiscountConfig implements Serializable {
@ApiModelProperty
(
"免单券id(充送免单券)"
)
@ApiModelProperty
(
"免单券id(充送免单券)"
)
private
Integer
couponId
;
private
Integer
couponId
;
private
String
info
;
}
}
src/main/java/com/gogirl/interfaces/store/oa/TakeLeaveEventController.java
View file @
8c53c08d
...
@@ -79,7 +79,7 @@ public class TakeLeaveEventController {
...
@@ -79,7 +79,7 @@ public class TakeLeaveEventController {
@ApiOperation
(
"/总后台审批请假"
)
@ApiOperation
(
"/总后台审批请假"
)
@PostMapping
(
"/admin/takeLeave/adminRefuseTakeLeaveEvent/{takeLeaveEventId}"
)
@PostMapping
(
"/admin/takeLeave/adminRefuseTakeLeaveEvent/{takeLeaveEventId}"
)
public
JsonResult
<
Void
>
adminRefuseTakeLeaveEvent
(
@PathVariable
Integer
takeLeaveEventId
)
{
public
JsonResult
<
Void
>
adminRefuseTakeLeaveEvent
(
@PathVariable
Long
takeLeaveEventId
)
{
takeLeaveEventCmdService
.
adminRefuseTakeLeaveEvent
(
takeLeaveEventId
);
takeLeaveEventCmdService
.
adminRefuseTakeLeaveEvent
(
takeLeaveEventId
);
return
JsonResult
.
success
();
return
JsonResult
.
success
();
}
}
...
...
src/test/java/com/gogirl/application/store/store/impl/TakeLeaveEventCmdServiceImplTest.java
0 → 100644
View file @
8c53c08d
package
com
.
gogirl
.
application
.
store
.
store
.
impl
;
import
com.gogirl.application.store.store.TakeLeaveEventCmdService
;
import
lombok.extern.slf4j.Slf4j
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.test.context.ActiveProfiles
;
import
org.springframework.test.context.junit4.SpringRunner
;
import
javax.annotation.Resource
;
/**
* <p>
*
* </p>
*
* @author robbendev
* @since 2020/10/23 2:54 下午
*/
@RunWith
(
SpringRunner
.
class
)
@SpringBootTest
@Slf4j
@ActiveProfiles
(
"prod"
)
public
class
TakeLeaveEventCmdServiceImplTest
{
@Resource
TakeLeaveEventCmdService
takeLeaveEventCmdService
;
@Test
public
void
adminRefuseTakeLeaveEvent
()
{
takeLeaveEventCmdService
.
adminRefuseTakeLeaveEvent
(
1241694148554134617L
);
}
}
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