Commit 88e44011 authored by 吴琼's avatar 吴琼

电商客服信息查询

parent 069840a7
...@@ -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;
} }
...@@ -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());
}
} }
...@@ -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;
} }
...@@ -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);
} }
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