Commit f776b6fd authored by 吴琼's avatar 吴琼

修改配置

parent 9a814e07
......@@ -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());
......
......@@ -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 = kdspUrl + "/api/kdsp/op/userBenefits/center/getEventType";
String url = "http://192.168.28.55:8033/api/kdsp/op/userBenefits/center/getEventType";
String url = kdspOperationUrl + "/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= kdspUrl +"/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= kdspOperationUrl +"/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= kdspUrl +"/api/kdsp/op/coupon/receiver/pickup-list";
String url= "http://192.168.28.55:8033/api/kdsp/op/coupon/receiver/pickup-list";
String url= kdspOperationUrl +"/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 = kdspUrl + "/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 = kdspOperationUrl + "/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");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment