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
a02897e3
Commit
a02897e3
authored
Apr 11, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
文档注释
parent
a6b4628f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
16 deletions
+18
-16
OverTimeRecordController.java
...interfaces/store/attendance/OverTimeRecordController.java
+0
-2
TakeLeaveEventController.java
...interfaces/store/attendance/TakeLeaveEventController.java
+0
-1
CustomerController.java
...n/java/com/gogirl/interfaces/user/CustomerController.java
+17
-4
MessageController.java
...in/java/com/gogirl/interfaces/user/MessageController.java
+1
-6
application.yml
src/main/resources/application.yml
+0
-3
No files found.
src/main/java/com/gogirl/interfaces/store/attendance/OverTimeRecordController.java
View file @
a02897e3
...
@@ -33,10 +33,8 @@ public class OverTimeRecordController {
...
@@ -33,10 +33,8 @@ public class OverTimeRecordController {
@RequestBody
OrderTimeRecordPageQuery
qry
)
{
@RequestBody
OrderTimeRecordPageQuery
qry
)
{
Calendar
cale
=
Calendar
.
getInstance
();
Calendar
cale
=
Calendar
.
getInstance
();
SimpleDateFormat
format
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
// 获取前月的第一天
// 获取前月的第一天
cale
=
Calendar
.
getInstance
();
cale
.
add
(
Calendar
.
MONTH
,
0
);
cale
.
add
(
Calendar
.
MONTH
,
0
);
cale
.
set
(
Calendar
.
DAY_OF_MONTH
,
1
);
cale
.
set
(
Calendar
.
DAY_OF_MONTH
,
1
);
Date
firstDay
=
cale
.
getTime
();
Date
firstDay
=
cale
.
getTime
();
...
...
src/main/java/com/gogirl/interfaces/store/attendance/TakeLeaveEventController.java
View file @
a02897e3
...
@@ -28,7 +28,6 @@ public class TakeLeaveEventController {
...
@@ -28,7 +28,6 @@ public class TakeLeaveEventController {
*/
*/
private
final
TakeLeaveEventCmdService
takeLeaveEventCmdService
;
private
final
TakeLeaveEventCmdService
takeLeaveEventCmdService
;
private
final
GogirlTokenService
gogirlTokenService
;
@ApiOperation
(
"/申请请假"
)
@ApiOperation
(
"/申请请假"
)
...
...
src/main/java/com/gogirl/interfaces/user/CustomerController.java
View file @
a02897e3
...
@@ -4,7 +4,6 @@ import com.gogirl.application.user.customer.CustomerService;
...
@@ -4,7 +4,6 @@ import com.gogirl.application.user.customer.CustomerService;
import
com.gogirl.domain.user.customer.Customer
;
import
com.gogirl.domain.user.customer.Customer
;
import
com.gogirl.dto.customer.CustomerOrderDetail
;
import
com.gogirl.dto.customer.CustomerOrderDetail
;
import
com.gogirl.infrastructure.common.base.JsonResult
;
import
com.gogirl.infrastructure.common.base.JsonResult
;
import
com.gogirl.infrastructure.config.property.GogirlProperties
;
import
com.gogirl.infrastructure.service.file.FileService
;
import
com.gogirl.infrastructure.service.file.FileService
;
import
com.gogirl.infrastructure.util.Base64Utils
;
import
com.gogirl.infrastructure.util.Base64Utils
;
import
com.gogirl.shared.user.query.qry.CustomerQuery
;
import
com.gogirl.shared.user.query.qry.CustomerQuery
;
...
@@ -26,10 +25,20 @@ public class CustomerController {
...
@@ -26,10 +25,20 @@ public class CustomerController {
@Resource
@Resource
private
CustomerService
customerService
;
private
CustomerService
customerService
;
@Resource
@Resource
private
GogirlProperties
gogirlProperties
;
@Resource
FileService
fileService
;
FileService
fileService
;
/*cmd 接口开始*/
/**
* <p>提交or更新用户街道地址信息</p>
*
* @param customerId 用户id
* @param province 省份
* @param city 城市
* @param area 地区
* @param street 街道
* @return
*/
@ApiOperation
(
"用户授权接街道地址信息"
)
@ApiOperation
(
"用户授权接街道地址信息"
)
@GetMapping
(
"/customer/xcx/bindAddressInfo"
)
@GetMapping
(
"/customer/xcx/bindAddressInfo"
)
public
JsonResult
<
String
>
bindAddressInfo
(
@RequestParam
Integer
customerId
,
public
JsonResult
<
String
>
bindAddressInfo
(
@RequestParam
Integer
customerId
,
...
@@ -41,6 +50,11 @@ public class CustomerController {
...
@@ -41,6 +50,11 @@ public class CustomerController {
return
JsonResult
.
success
();
return
JsonResult
.
success
();
}
}
/*cmd接口结束*/
/*query接口开始*/
/*query接口结束*/
@ApiOperation
((
"查询会员"
))
@ApiOperation
((
"查询会员"
))
@PostMapping
(
"/customer/xcx/query"
)
@PostMapping
(
"/customer/xcx/query"
)
public
JsonResult
<
Customer
>
query
(
@RequestBody
CustomerQuery
qry
)
{
public
JsonResult
<
Customer
>
query
(
@RequestBody
CustomerQuery
qry
)
{
...
@@ -48,7 +62,6 @@ public class CustomerController {
...
@@ -48,7 +62,6 @@ public class CustomerController {
return
JsonResult
.
success
(
customer
);
return
JsonResult
.
success
(
customer
);
}
}
@ApiOperation
(
value
=
"客户根据code获取token"
)
@ApiOperation
(
value
=
"客户根据code获取token"
)
@GetMapping
(
"/customer/xcx/login"
)
@GetMapping
(
"/customer/xcx/login"
)
public
JsonResult
<
String
>
login
(
@RequestParam
String
code
)
{
public
JsonResult
<
String
>
login
(
@RequestParam
String
code
)
{
...
...
src/main/java/com/gogirl/interfaces/user/MessageController.java
View file @
a02897e3
...
@@ -20,10 +20,9 @@ import org.springframework.web.bind.annotation.*;
...
@@ -20,10 +20,9 @@ import org.springframework.web.bind.annotation.*;
@RestController
@RestController
@AllArgsConstructor
@AllArgsConstructor
@Api
(
tags
=
{
"
version2.0:
消息接口"
})
@Api
(
tags
=
{
"
用户消息
消息接口"
})
@Slf4j
@Slf4j
public
class
MessageController
{
public
class
MessageController
{
private
final
GogirlTokenService
gogirlTokenService
;
private
final
GogirlTokenService
gogirlTokenService
;
private
final
VisitLogService
visitLogService
;
private
final
VisitLogService
visitLogService
;
...
@@ -49,9 +48,6 @@ public class MessageController {
...
@@ -49,9 +48,6 @@ public class MessageController {
@PostMapping
(
"/customer/message/loginLog"
)
@PostMapping
(
"/customer/message/loginLog"
)
public
JsonResult
<
Integer
>
loginLog
(
@RequestHeader
String
token
)
{
public
JsonResult
<
Integer
>
loginLog
(
@RequestHeader
String
token
)
{
GogirlToken
gt
=
gogirlTokenService
.
getByToken
(
token
);
GogirlToken
gt
=
gogirlTokenService
.
getByToken
(
token
);
if
(
gt
==
null
)
{
throw
new
RRException
(
2000
,
"token失效"
);
}
VisitsLog
visitsLog
=
visitLogService
.
loginLog
(
gt
.
getCustomerId
());
VisitsLog
visitsLog
=
visitLogService
.
loginLog
(
gt
.
getCustomerId
());
return
JsonResult
.
success
(
visitsLog
.
getId
());
return
JsonResult
.
success
(
visitsLog
.
getId
());
}
}
...
@@ -69,7 +65,6 @@ public class MessageController {
...
@@ -69,7 +65,6 @@ public class MessageController {
public
JsonResult
<
Void
>
recordActivityId
(
@RequestHeader
String
token
,
public
JsonResult
<
Void
>
recordActivityId
(
@RequestHeader
String
token
,
@RequestParam
Integer
visitsId
,
@RequestParam
Integer
visitsId
,
@RequestParam
Integer
activityId
)
{
@RequestParam
Integer
activityId
)
{
visitLogService
.
recordActivityId
(
visitsId
,
activityId
);
visitLogService
.
recordActivityId
(
visitsId
,
activityId
);
return
JsonResult
.
success
();
return
JsonResult
.
success
();
...
...
src/main/resources/application.yml
View file @
a02897e3
...
@@ -9,9 +9,6 @@ spring:
...
@@ -9,9 +9,6 @@ spring:
jackson
:
jackson
:
date-format
:
yyyy-MM-dd HH:mm:ss
date-format
:
yyyy-MM-dd HH:mm:ss
time-zone
:
GMT+8
time-zone
:
GMT+8
# redis:
# timeout: 0
#mybatis 配置
#mybatis 配置
mybatis
:
mybatis
:
...
...
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