Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
customer-service
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
QG
customer-service
Commits
88e44011
Commit
88e44011
authored
Jan 17, 2022
by
吴琼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
电商客服信息查询
parent
069840a7
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
273 additions
and
4 deletions
+273
-4
UserBasicInfo.java
.../cn/quantgroup/customer/model/xyqbuser/UserBasicInfo.java
+22
-2
UserRest.java
src/main/java/cn/quantgroup/customer/rest/UserRest.java
+44
-2
UserQueryParam.java
...n/quantgroup/customer/rest/param/user/UserQueryParam.java
+18
-0
IUserService.java
...ain/java/cn/quantgroup/customer/service/IUserService.java
+7
-0
UserServiceImpl.java
.../cn/quantgroup/customer/service/impl/UserServiceImpl.java
+182
-0
No files found.
src/main/java/cn/quantgroup/customer/model/xyqbuser/UserBasicInfo.java
View file @
88e44011
...
@@ -2,6 +2,8 @@ package cn.quantgroup.customer.model.xyqbuser;
...
@@ -2,6 +2,8 @@ package cn.quantgroup.customer.model.xyqbuser;
import
lombok.Data
;
import
lombok.Data
;
import
java.math.BigDecimal
;
/**
/**
* 信用钱包用户基本展示信息
* 信用钱包用户基本展示信息
*
*
...
@@ -41,6 +43,24 @@ public class UserBasicInfo {
...
@@ -41,6 +43,24 @@ public class UserBasicInfo {
* 手机号(明文)
* 手机号(明文)
*/
*/
private
String
phoneNumber
;
private
String
phoneNumber
;
/**
*客户权益
*/
private
String
levelBenefit
;
/**
* 等级
*/
private
Integer
level
;
/**
* 等级名称
*/
private
String
levelName
;
/**
* 积分
*/
private
BigDecimal
point
;
/**
* 有效期
*/
private
String
levelValidityTerm
;
}
}
src/main/java/cn/quantgroup/customer/rest/UserRest.java
View file @
88e44011
...
@@ -23,11 +23,11 @@ import org.apache.commons.lang3.StringUtils;
...
@@ -23,11 +23,11 @@ import org.apache.commons.lang3.StringUtils;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.security.authentication.UsernamePasswordAuthenticationToken
;
import
org.springframework.security.authentication.UsernamePasswordAuthenticationToken
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.validation.Valid
;
import
javax.validation.Valid
;
import
java.security.Principal
;
import
java.security.Principal
;
import
java.time.LocalDate
;
import
java.time.LocalDate
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -246,8 +246,50 @@ public class UserRest {
...
@@ -246,8 +246,50 @@ public class UserRest {
}
}
return
JsonResult
.
buildSuccessResult
(
"success"
,
result
);
return
JsonResult
.
buildSuccessResult
(
"success"
,
result
);
}
}
//add by wuq 2022-01-14 begin
/**
* 积分类型初始化
* @return
*/
@PostMapping
(
value
=
"/search/getRewardPointsType"
)
public
JsonResult
getRewardPointsTypeInit
()
{
MoResult
<
String
>
result
=
userService
.
getRewardPointsType
();
if
(!
result
.
isSuccess
()){
return
JsonResult
.
buildErrorStateResult
(
result
.
getMsg
(),
result
.
getData
());
}
return
JsonResult
.
buildSuccessResult
(
"success"
,
result
.
getData
());
}
/**
*根据userId和phoneNo查询基本信息
*/
@PostMapping
(
value
=
"/search/userInfo"
)
public
JsonResult
getBasicUserInfo
(
UserQueryParam
userQueryParam
)
{
JsonResult
<
UserBasicInfo
>
result
=
userService
.
findUserInfoByUserParam
(
userQueryParam
);
return
JsonResult
.
buildSuccessResult
(
"success"
,
result
);
}
/**
*根据userId查询优惠券信息(详情)
*/
@PostMapping
(
value
=
"/search/getUserCouponInfo"
)
public
JsonResult
getUserCouponInfo
(
UserQueryParam
userQueryParam
)
{
MoResult
<
String
>
result
=
userService
.
queryUserCouponInfoByUserParam
(
userQueryParam
);
if
(!
result
.
isSuccess
()){
return
JsonResult
.
buildErrorStateResult
(
result
.
getMsg
(),
result
.
getData
());
}
return
JsonResult
.
buildSuccessResult
(
"success"
,
result
);
}
/**
*根据积分类型和操作时间查询积分明细
*/
@PostMapping
(
value
=
"/search/queryPointDetailByPage"
)
public
JsonResult
queryPointDetailByPage
(
UserQueryParam
userQueryParam
)
{
MoResult
<
String
>
result
=
userService
.
queryPointDetailByPage
(
userQueryParam
);
if
(
result
==
null
||
!
result
.
isSuccess
()){
return
JsonResult
.
buildErrorStateResult
(
result
.
getMsg
(),
result
.
getData
());
}
return
JsonResult
.
buildSuccessResult
(
"success"
,
result
.
getData
());
}
}
}
src/main/java/cn/quantgroup/customer/rest/param/user/UserQueryParam.java
View file @
88e44011
...
@@ -22,4 +22,22 @@ public class UserQueryParam {
...
@@ -22,4 +22,22 @@ public class UserQueryParam {
private
Long
userId
;
private
Long
userId
;
private
String
uuid
;
private
String
uuid
;
/**
* 积分类型
*/
private
Integer
eventType
;
/**
* 操作时间
*/
private
String
operationTime
;
/**
* 当前页数
*/
private
Integer
pageNo
;
/**
* 每页多少条数据
*/
private
Integer
pageSize
;
private
String
status
;
}
}
src/main/java/cn/quantgroup/customer/service/IUserService.java
View file @
88e44011
...
@@ -68,4 +68,11 @@ public interface IUserService extends UserDetailsService {
...
@@ -68,4 +68,11 @@ public interface IUserService extends UserDetailsService {
*/
*/
MoResult
<
String
>
modifyUserDetail
(
Long
userId
,
String
realName
,
String
idNO
);
MoResult
<
String
>
modifyUserDetail
(
Long
userId
,
String
realName
,
String
idNO
);
MoResult
<
String
>
getRewardPointsType
();
JsonResult
<
UserBasicInfo
>
findUserInfoByUserParam
(
UserQueryParam
userQueryParam
);
MoResult
<
String
>
queryPointDetailByPage
(
UserQueryParam
userQueryParam
);
MoResult
<
String
>
queryUserCouponInfoByUserParam
(
UserQueryParam
userQueryParam
);
}
}
src/main/java/cn/quantgroup/customer/service/impl/UserServiceImpl.java
View file @
88e44011
This diff is collapsed.
Click to expand it.
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