Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
huhu-partner
Project
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guanchen
huhu-partner
Commits
c0acc456
Commit
c0acc456
authored
Jun 27, 2019
by
houseme
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test
parent
76fbae87
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
6 deletions
+12
-6
pom.xml
pom.xml
+4
-0
PartnerController.java
...com/lanren/huhu/partner/controller/PartnerController.java
+2
-2
PartnerAccountManager.java
...om/lanren/huhu/partner/manager/PartnerAccountManager.java
+2
-2
Partner.java
src/main/java/com/lanren/huhu/partner/model/Partner.java
+2
-2
ValidationMessages.properties
src/main/resources/ValidationMessages.properties
+2
-0
No files found.
pom.xml
View file @
c0acc456
...
...
@@ -41,6 +41,10 @@
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-validation
</artifactId>
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-web
</artifactId>
<exclusions>
<exclusion>
...
...
src/main/java/com/lanren/huhu/partner/controller/PartnerController.java
View file @
c0acc456
package
com
.
lanren
.
huhu
.
partner
.
controller
;
import
com.lanren.huhu.partner.domain.PartnerAccount
;
import
com.lanren.huhu.partner.manager.PartnerAccountManager
;
import
com.lanren.huhu.partner.model.Partner
;
import
com.lanren.huhu.partner.result.Result
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.web.bind.annotation.*
;
import
java.time.LocalDateTime
;
import
java.util.Map
;
/** * @author houseme * @date 2019-06-26 11:00 * @Project partner * @Package com.lanren.huhu.partner.controller * @File: PartnerController */
@RestController
@RequestMapping
(
"/v1/partner"
)
public
class
PartnerController
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
PartnerController
.
class
);
@Autowired
private
PartnerAccountManager
partnerAccountManager
;
@RequestMapping
(
value
=
"/{id}"
,
method
=
RequestMethod
.
GET
)
public
Result
<
PartnerAccount
>
one
(
@PathVariable
(
"id"
)
Integer
id
,
@RequestHeader
HttpHeaders
headers
)
{
if
(
logger
.
isInfoEnabled
())
{
logger
.
info
(
"partner one userId:{},header:{},time:{}"
,
id
,
headers
.
entrySet
().
toString
(),
LocalDateTime
.
now
());
}
return
partnerAccountManager
.
findByUserId
(
id
);
}
@RequestMapping
(
value
=
"/level"
,
method
=
RequestMethod
.
POST
)
public
Result
<
Map
<
String
,
Integer
>>
getPartnerLevel
(
@RequestParam
Integer
userId
,
@RequestBody
Partner
partner
,
@RequestHeader
HttpHeaders
headers
)
{
if
(
logger
.
isInfoEnabled
())
{
logger
.
info
(
"getPartnerLevel userId:{},header:{},time:{}"
,
userId
,
headers
.
entrySet
().
toArray
(),
LocalDateTime
.
now
());
}
return
partnerAccountManager
.
getPartnerLevel
(
partner
.
getUserId
());
}
}
\ No newline at end of file
package
com
.
lanren
.
huhu
.
partner
.
controller
;
import
com.lanren.huhu.partner.domain.PartnerAccount
;
import
com.lanren.huhu.partner.manager.PartnerAccountManager
;
import
com.lanren.huhu.partner.model.Partner
;
import
com.lanren.huhu.partner.result.Result
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.validation.BindingResult
;
import
org.springframework.validation.ObjectError
;
import
org.springframework.web.bind.annotation.*
;
import
java.time.LocalDateTime
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
/** * @Author houseme * @Date 2019-06-26 11:00 * @Project partner * @Package com.lanren.huhu.partner.controller * @File: PartnerController */
@RestController
@RequestMapping
(
"/v1/partner"
)
public
class
PartnerController
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
PartnerController
.
class
);
@Autowired
private
PartnerAccountManager
partnerAccountManager
;
@RequestMapping
(
value
=
"/{id}"
,
method
=
RequestMethod
.
GET
)
public
Result
<
PartnerAccount
>
one
(
@PathVariable
(
"id"
)
Integer
id
,
@RequestHeader
HttpHeaders
headers
)
{
if
(
logger
.
isInfoEnabled
())
{
logger
.
info
(
"partner one userId:{},header:{},time:{}"
,
id
,
headers
.
entrySet
().
toString
(),
LocalDateTime
.
now
());
}
return
partnerAccountManager
.
findByUserId
(
id
);
}
@RequestMapping
(
value
=
"/level"
,
method
=
RequestMethod
.
POST
)
public
Result
<
Map
<
String
,
Integer
>>
getPartnerLevel
(
@RequestParam
Integer
userId
,
@RequestBody
Partner
partner
,
@RequestHeader
HttpHeaders
headers
)
{
if
(
logger
.
isInfoEnabled
())
{
logger
.
info
(
"getPartnerLevel userId:{},header:{},time:{}"
,
userId
,
headers
.
entrySet
().
toArray
(),
LocalDateTime
.
now
());
}
return
partnerAccountManager
.
getPartnerLevel
(
partner
.
getUserId
());
}
@RequestMapping
(
value
=
"/userId/{id}"
,
method
=
RequestMethod
.
POST
)
public
Result
<
PartnerAccount
>
getOne
(
@PathVariable
(
"id"
)
Integer
id
,
@RequestBody
Partner
partner
,
@RequestHeader
HttpHeaders
headers
,
BindingResult
result
)
{
if
(
logger
.
isInfoEnabled
())
{
List
<
String
>
list
=
new
ArrayList
<>();
if
(
result
.
hasErrors
())
{
List
<
ObjectError
>
errors
=
result
.
getAllErrors
();
for
(
ObjectError
objectError
:
errors
)
{
list
.
add
(
objectError
.
getDefaultMessage
());
}
Result
<
PartnerAccount
>
objectResult
=
new
Result
<>();
objectResult
.
setMessage
(
list
.
toString
());
return
objectResult
;
}
logger
.
info
(
"partner one userId:{},header:{},time:{}"
,
id
,
headers
.
entrySet
().
toString
(),
LocalDateTime
.
now
());
}
return
partnerAccountManager
.
findByUserId
(
id
);
}
}
\ No newline at end of file
...
...
src/main/java/com/lanren/huhu/partner/manager/PartnerAccountManager.java
View file @
c0acc456
package
com
.
lanren
.
huhu
.
partner
.
manager
;
import
com.lanren.huhu.partner.domain.PartnerAccount
;
import
com.lanren.huhu.partner.result.Result
;
import
com.lanren.huhu.partner.service.PartnerAccountService
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
java.time.LocalDateTime
;
import
java.util.HashMap
;
import
java.util.Map
;
/** * @author houseme * @date 2019-06-26 10:56 * @Project partner * @Package com.lanren.huhu.partner.manager * @File: PartnerAccountManager */
@Component
public
class
PartnerAccountManager
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
PartnerAccountManager
.
class
);
@Autowired
private
PartnerAccountService
partnerAccountService
;
/*** * 获取合伙人账户信息 * @param userId * @return */
public
Result
<
PartnerAccount
>
findByUserId
(
Integer
userId
)
{
Result
<
PartnerAccount
>
result
=
new
Result
<>();
if
(
logger
.
isDebugEnabled
())
{
logger
.
info
(
"PartnerAccountManager findByUserId userId:{},time:{}"
,
userId
,
LocalDateTime
.
now
());
}
result
.
setData
(
partnerAccountService
.
getOneByUserId
(
userId
));
return
result
;
}
public
Result
<
Map
<
String
,
Integer
>>
getPartnerLevel
(
Integer
userId
)
{
if
(
logger
.
isDebugEnabled
())
{
logger
.
info
(
"PartnerAccountManager getPartnerLevel userId:{},time:{}"
,
userId
,
LocalDateTime
.
now
());
}
Result
<
Map
<
String
,
Integer
>>
result
=
new
Result
<>();
Map
<
String
,
Integer
>
map
=
new
HashMap
<
String
,
Integer
>();
int
partnerLevel
;
PartnerAccount
partnerAccount
=
partnerAccountService
.
getOneByUserId
(
userId
);
if
(
null
!=
partnerAccount
)
{
if
(
partnerAccount
.
getIsSuperPartner
()
==
1
)
{
partnerLevel
=
30
;
}
else
{
partnerLevel
=
partnerAccount
.
getPartnerLevel
();
}
}
else
{
partnerLevel
=
-
1
;
result
.
setCode
(
601
);
}
map
.
put
(
"level"
,
partnerLevel
);
result
.
setData
(
map
);
return
result
;
}
}
\ No newline at end of file
package
com
.
lanren
.
huhu
.
partner
.
manager
;
import
com.lanren.huhu.partner.domain.PartnerAccount
;
import
com.lanren.huhu.partner.result.Result
;
import
com.lanren.huhu.partner.service.PartnerAccountService
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
java.time.LocalDateTime
;
import
java.util.HashMap
;
import
java.util.Map
;
/** * @author houseme * @date 2019-06-26 10:56 * @Project partner * @Package com.lanren.huhu.partner.manager * @File: PartnerAccountManager */
@Component
public
class
PartnerAccountManager
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
PartnerAccountManager
.
class
);
@Autowired
private
PartnerAccountService
partnerAccountService
;
/*** * 获取合伙人账户信息 * @param userId * @return */
public
Result
<
PartnerAccount
>
findByUserId
(
Integer
userId
)
{
Result
<
PartnerAccount
>
result
=
new
Result
<>();
if
(
logger
.
isDebugEnabled
())
{
logger
.
info
(
"PartnerAccountManager findByUserId userId:{},time:{}"
,
userId
,
LocalDateTime
.
now
());
}
PartnerAccount
partnerAccount
=
partnerAccountService
.
getOneByUserId
(
userId
);
logger
.
info
(
"findByUserId {}"
,
partnerAccount
);
result
.
setData
(
partnerAccount
);
return
result
;
}
public
Result
<
Map
<
String
,
Integer
>>
getPartnerLevel
(
Integer
userId
)
{
if
(
logger
.
isDebugEnabled
())
{
logger
.
info
(
"PartnerAccountManager getPartnerLevel userId:{},time:{}"
,
userId
,
LocalDateTime
.
now
());
}
Result
<
Map
<
String
,
Integer
>>
result
=
new
Result
<>();
Map
<
String
,
Integer
>
map
=
new
HashMap
<
String
,
Integer
>();
int
partnerLevel
;
PartnerAccount
partnerAccount
=
partnerAccountService
.
getOneByUserId
(
userId
);
if
(
null
!=
partnerAccount
)
{
if
(
partnerAccount
.
getIsSuperPartner
()
==
1
)
{
partnerLevel
=
30
;
}
else
{
partnerLevel
=
partnerAccount
.
getPartnerLevel
();
}
}
else
{
partnerLevel
=
-
1
;
result
.
setCode
(
601
);
}
map
.
put
(
"level"
,
partnerLevel
);
result
.
setData
(
map
);
return
result
;
}
}
\ No newline at end of file
...
...
src/main/java/com/lanren/huhu/partner/model/Partner.java
View file @
c0acc456
package
com
.
lanren
.
huhu
.
partner
.
model
;
import
lombok.Data
;
import
java.io.Serializable
;
/** * @author houseme * @date 2019-06-26 11:47 * @Project partner * @Package com.lanren.huhu.partner.model * @File: Partner */
@Data
public
class
Partner
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
private
Integer
level
;
private
Integer
userId
;
}
\ No newline at end of file
package
com
.
lanren
.
huhu
.
partner
.
model
;
import
lombok.Data
;
import
javax.validation.constraints.DecimalMax
;
import
javax.validation.constraints.DecimalMin
;
import
java.io.Serializable
;
/** * @author houseme * @date 2019-06-26 11:47 * @Project partner * @Package com.lanren.huhu.partner.model * @File: Partner */
@Data
public
class
Partner
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
@DecimalMin
(
value
=
"1"
,
message
=
"{partner.level.min}"
)
@DecimalMax
(
value
=
"5"
,
message
=
"{partner.level.max}"
)
private
Integer
level
;
@DecimalMin
(
value
=
"1"
,
message
=
"{partner.user.id}"
)
private
Integer
userId
;
}
\ No newline at end of file
...
...
src/main/resources/ValidationMessages.properties
0 → 100644
View file @
c0acc456
partner.user.id
=
\u7528\u6237
id
\u
4E0D
\u
80FD
\u
5C0F
\u
4E8E0 partner.level.min=
\u5408\u
4F19
\u
4EBA
\u
7B49
\u
7EA7
\u6700\u
4F4E
\u
662F10 partner.level.max=
\u5408\u
4F19
\u
4EBA
\u
7B49
\u
7EA7
\u6700\u
9AD8
\u
662F30
\ No newline at end of file
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