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
f776b6fd
Commit
f776b6fd
authored
Jan 17, 2022
by
吴琼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改配置
parent
9a814e07
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
10 deletions
+15
-10
UserRest.java
src/main/java/cn/quantgroup/customer/rest/UserRest.java
+4
-0
UserServiceImpl.java
.../cn/quantgroup/customer/service/impl/UserServiceImpl.java
+11
-10
No files found.
src/main/java/cn/quantgroup/customer/rest/UserRest.java
View file @
f776b6fd
...
...
@@ -30,6 +30,7 @@ import java.time.LocalDate;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Objects
;
import
static
cn
.
quantgroup
.
customer
.
constant
.
Constant
.
GSON
;
...
...
@@ -286,6 +287,9 @@ public class UserRest {
*/
@PostMapping
(
value
=
"/search/queryPointDetailByPage"
)
public
JsonResult
queryPointDetailByPage
(
UserQueryParam
userQueryParam
)
{
if
(
Objects
.
isNull
(
userQueryParam
.
getUserId
())){
return
JsonResult
.
buildErrorStateResult
(
"userId不能为空"
,
null
);
}
MoResult
<
String
>
result
=
userService
.
queryPointDetailByPage
(
userQueryParam
);
if
(
result
==
null
||
!
"0000"
.
equals
(
result
.
getCode
())){
return
JsonResult
.
buildErrorStateResult
(
result
.
getMsg
(),
result
.
getData
());
...
...
src/main/java/cn/quantgroup/customer/service/impl/UserServiceImpl.java
View file @
f776b6fd
...
...
@@ -52,12 +52,10 @@ import org.springframework.web.context.request.RequestContextHolder;
import
java.math.BigDecimal
;
import
java.time.LocalDate
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Objects
;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
import
static
cn
.
quantgroup
.
customer
.
constant
.
Constant
.
GSON
;
...
...
@@ -72,6 +70,9 @@ public class UserServiceImpl implements IUserService {
private
String
sidecarUrl
;
@Value
(
"${kdsp.http.api}"
)
private
String
kdspUrl
;
@Value
(
"${kdsp-operation}"
)
private
String
kdspOperationUrl
;
...
...
@@ -770,8 +771,8 @@ public class UserServiceImpl implements IUserService {
//add by wuq 2022-01-15 begin
@Override
public
MoResult
<
String
>
getRewardPointsType
(){
//String url = kdsp
Url + "/api/kdsp/op/userBenefits/center/getEventType";
String
url
=
"http://192.168.28.55:8033/api/kdsp/op/userBenefits/center/getEventType"
;
String
url
=
kdspOperation
Url
+
"/api/kdsp/op/userBenefits/center/getEventType"
;
//
String url = "http://192.168.28.55:8033/api/kdsp/op/userBenefits/center/getEventType";
try
{
Map
<
String
,
String
>
header
=
Maps
.
newHashMap
();
header
.
put
(
"Content-type"
,
"application/x-www-form-urlencoded"
);
...
...
@@ -789,8 +790,8 @@ public class UserServiceImpl implements IUserService {
final
String
LOG_PRE
=
"UserServiceImpl.findUserInfoByUserParam"
;
log
.
info
(
"{} 查询用户信息 UserQueryParam={}"
,
LOG_PRE
,
userQueryParam
);
//调用kdsp接口获取会员权益相关信息
//String url= kdsp
Url +"/api/kdsp/op/userBenefits/user-benefits-point/getUserBenefit";
String
url
=
"http://192.168.28.55:8033/api/kdsp/op/userBenefits/user-benefits-point/getUserBenefit"
;
String
url
=
kdspOperation
Url
+
"/api/kdsp/op/userBenefits/user-benefits-point/getUserBenefit"
;
//
String url= "http://192.168.28.55:8033/api/kdsp/op/userBenefits/user-benefits-point/getUserBenefit";
String
result
=
""
;
try
{
Map
<
String
,
String
>
header
=
Maps
.
newHashMap
();
...
...
@@ -842,8 +843,8 @@ public class UserServiceImpl implements IUserService {
final
String
LOG_PRE
=
"UserServiceImpl.getUserCouponInfoByUserParam"
;
log
.
info
(
"{} 查询用户信息 UserQueryParam={}"
,
LOG_PRE
,
userQueryParam
);
//调用kdsp接口获取会员优惠券相关信息
//String url= kdsp
Url +"/api/kdsp/op/coupon/receiver/pickup-list";
String
url
=
"http://192.168.28.55:8033/api/kdsp/op/coupon/receiver/pickup-list"
;
String
url
=
kdspOperation
Url
+
"/api/kdsp/op/coupon/receiver/pickup-list"
;
//
String url= "http://192.168.28.55:8033/api/kdsp/op/coupon/receiver/pickup-list";
try
{
Map
<
String
,
String
>
header
=
Maps
.
newHashMap
();
...
...
@@ -927,8 +928,8 @@ public class UserServiceImpl implements IUserService {
* @return
*/
public
MoResult
<
String
>
queryPointDetailByPage
(
UserQueryParam
userQueryParam
)
{
//String url = kdsp
Url + "/api/kdsp/op/userBenefits/user-benefits-detail/queryPointDetailByPage";
String
url
=
"http://192.168.28.55:8033/api/kdsp/op/userBenefits/user-benefits-detail/queryPointDetailByPage"
;
String
url
=
kdspOperation
Url
+
"/api/kdsp/op/userBenefits/user-benefits-detail/queryPointDetailByPage"
;
//
String url = "http://192.168.28.55:8033/api/kdsp/op/userBenefits/user-benefits-detail/queryPointDetailByPage";
try
{
Map
<
String
,
String
>
header
=
Maps
.
newHashMap
();
header
.
put
(
"Content-type"
,
"application/json"
);
...
...
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