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
3a7093bc
Commit
3a7093bc
authored
Mar 18, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
04b44409
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
21 deletions
+19
-21
ScheduleManageServiceImpl.java
...plication/order/serve/impl/ScheduleManageServiceImpl.java
+1
-1
GogirlTokenServiceImpl.java
...m/gogirl/application/xcx/impl/GogirlTokenServiceImpl.java
+10
-4
MvcInterceptorConfig.java
...om/gogirl/infrastructure/config/MvcInterceptorConfig.java
+3
-9
PhoneLoginController.java
.../java/com/gogirl/interfaces/xcx/PhoneLoginController.java
+5
-7
No files found.
src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java
View file @
3a7093bc
...
...
@@ -396,7 +396,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
List
<
Integer
>
technicianIds
=
treeProgramList
.
stream
().
map
(
StoreTechnicianPeriod:
:
getTechnicianId
).
collect
(
Collectors
.
toList
());
Integer
technicianId
=
storeTechnician
.
getTechnicianId
();
log
.
info
(
"technicianIds:{},technicianId:{}"
,
technicianIds
,
technicianId
);
log
.
debug
(
"technicianIds:{},technicianId:{}"
,
technicianIds
,
technicianId
);
boolean
b
=
technicianIds
.
contains
(
technicianId
);
//如果已经设置该美甲师的节点不为空 需要把当前节点的服务时间加上
...
...
src/main/java/com/gogirl/application/xcx/impl/GogirlTokenServiceImpl.java
View file @
3a7093bc
...
...
@@ -78,11 +78,17 @@ public class GogirlTokenServiceImpl implements GogirlTokenService {
GogirlToken
gogirlToken
=
SessionUtils
.
getCustomerToken
();
Customer
customer
=
customerMapper
.
selectById
(
gogirlToken
.
getCustomerId
());
customer
.
setRealName
(
realName
);
if
(
StringUtils
.
isEmpty
(
realName
))
{
customer
.
setRealName
(
realName
);
}
customer
.
setBirthday
(
birthday
);
customer
.
setSex
(
sex
);
customer
.
setPhone
(
phone
);
if
(
StringUtils
.
isNotEmpty
(
sex
))
{
customer
.
setSex
(
sex
);
}
if
(
StringUtils
.
isEmpty
(
phone
))
{
customer
.
setPhone
(
phone
);
}
List
<
Customer
>
phoneCustomer
=
customerMapper
.
selectList
(
new
LambdaQueryWrapper
<
Customer
>()
.
eq
(
Customer:
:
getPhone
,
phone
));
...
...
src/main/java/com/gogirl/infrastructure/config/MvcInterceptorConfig.java
View file @
3a7093bc
package
com
.
gogirl
.
infrastructure
.
config
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.gogirl.infrastructure.interceptor.LogHandlerInterceptor
;
import
com.gogirl.infrastructure.interceptor.LoginHandlerInterceptor
;
import
com.gogirl.infrastructure.interceptor.SessionHandlerInterceptor
;
import
lombok.AllArgsConstructor
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.http.converter.HttpMessageConverter
;
import
org.springframework.http.converter.json.Jackson2ObjectMapperBuilder
;
import
org.springframework.http.converter.json.MappingJackson2HttpMessageConverter
;
import
org.springframework.web.servlet.config.annotation.InterceptorRegistry
;
import
org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
;
import
org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport
;
import
java.text.SimpleDateFormat
;
import
java.util.List
;
import
java.util.TimeZone
;
@Configuration
@AllArgsConstructor
public
class
MvcInterceptorConfig
extends
WebMvcConfigurationSupport
{
...
...
@@ -37,6 +28,9 @@ public class MvcInterceptorConfig extends WebMvcConfigurationSupport {
.
addPathPatterns
(
"/**"
)
.
excludePathPatterns
(
"/swagger-resources/**"
,
"/webjars/**"
,
"/v2/**"
,
"/swagger-ui.html/**"
,
"/error"
)
//登陆
.
excludePathPatterns
(
"/customer/message/loginLog"
)
.
excludePathPatterns
(
"/customer/message/pageIn"
)
.
excludePathPatterns
(
"/customer/xcx/login"
)
.
excludePathPatterns
(
"/customer/csrf"
)
.
excludePathPatterns
(
"/customer/mallCategory/getCategoryTree"
)
...
...
src/main/java/com/gogirl/interfaces/xcx/PhoneLoginController.java
View file @
3a7093bc
...
...
@@ -2,12 +2,10 @@ package com.gogirl.interfaces.xcx;
import
com.gogirl.application.store.store.StoreTechnicianService
;
import
com.gogirl.application.xcx.GogirlTokenService
;
import
com.gogirl.application.xcx.WechatService
;
import
com.gogirl.domain.user.customer.Customer
;
import
com.gogirl.infrastructure.common.annotation.GogirlMember
;
import
com.gogirl.infrastructure.common.annotation.GogirlShop
;
import
com.gogirl.infrastructure.common.base.JsonResult
;
import
com.gogirl.infrastructure.mapper.store.store.StoreManageMapper
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.AllArgsConstructor
;
...
...
@@ -43,12 +41,12 @@ public class PhoneLoginController {
@ApiOperation
(
value
=
"小程序用户根据验证码绑定手机号码和称呼 生日的格式是:yyyy-MM-dd"
)
@PostMapping
(
"/customer/phone/bindPhoneAndName"
)
public
JsonResult
<
Customer
>
bindPhoneAndCode
(
@RequestHeader
String
token
,
@RequestParam
String
phone
,
@RequestParam
String
code
,
@RequestParam
String
realName
,
@RequestParam
@RequestParam
(
required
=
false
)
String
phone
,
@RequestParam
(
required
=
false
)
String
code
,
@RequestParam
(
required
=
false
)
String
realName
,
@RequestParam
(
required
=
false
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
Date
birthday
,
@RequestParam
String
sex
)
{
@RequestParam
(
required
=
false
)
String
sex
)
{
Customer
customer
=
gogirlTokenService
.
bindPhoneAndCode
(
phone
,
code
,
realName
,
birthday
,
sex
);
return
JsonResult
.
success
(
customer
);
...
...
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