From 73372f312e8b8bae98623006640b016f9a433988 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期一, 16 十月 2023 15:12:49 +0800
Subject: [PATCH] 10.16
---
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 60 ++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
index d0cd7c9..b0f28e2 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
@@ -9,6 +9,7 @@
import com.dsh.account.service.UserIntegralChangesService;
import com.dsh.account.util.ResultUtil;
import com.dsh.account.util.TokenUtil;
+import com.dsh.account.util.ToolUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -85,13 +86,23 @@
}
TAppUser tAppUser = tauService.getBaseMapper().selectById(appUserId);
if (null != tAppUser){
+ detailsVo.setUserId(appUserId);
detailsVo.setUserImage(tAppUser.getHeadImg());
detailsVo.setUserName(tAppUser.getName());
detailsVo.setUserPhone(tAppUser.getPhone());
- detailsVo.setSex(tAppUser.getGender() == 1 ? "男" : "女");
- detailsVo.setBirthday(format1.format(tAppUser.getBirthday()));
+ if(tAppUser.getGender()!=null){
+
+ detailsVo.setSex(tAppUser.getGender() == 1 ? "男" : "女");
+ }
+ System.out.println("============="+tAppUser);
+
+ if (tAppUser.getBirthday()!=null){
+ detailsVo.setBirthday(format1.format(tAppUser.getBirthday()));}
detailsVo.setAddress(tAppUser.getProvince()+tAppUser.getCity());
- detailsVo.setMemberLifespan(format1.format(tAppUser.getVipEndTime()));
+ if(tAppUser.getVipEndTime()!=null){
+
+ detailsVo.setMemberLifespan(format1.format(tAppUser.getVipEndTime()));
+ }
}
return ResultUtil.success(detailsVo);
}catch (Exception e){
@@ -105,15 +116,22 @@
@ApiOperation(value = "上传用户头像", tags = {"APP-使用福利"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
- @ApiImplicitParam(name = "file",value = "图片字节",dataType = "MultipartFile")
+ @ApiImplicitParam(name = "userImage",value = "用户头像连接",dataType = "string")
})
- public ResultUtil uploadAppUserProfile(MultipartFile file, HttpServletRequest request){
+ public ResultUtil uploadAppUserProfile(String userImage){
try {
Integer appUserId = tokenUtil.getUserIdFormRedis();
if(null == appUserId){
return ResultUtil.tokenErr();
}
- return ResultUtil.success(tauService.uploadAppUserHeadImg(appUserId,file,request));
+ TAppUser byId = tauService.getById(appUserId);
+ if (ToolUtil.isNotEmpty(userImage)){
+ byId.setHeadImg(userImage);
+ tauService.updateById(byId);
+ }else {
+ ResultUtil.error("头像不能为空！");
+ }
+ return ResultUtil.success();
}catch (Exception e){
return ResultUtil.runErr();
}
@@ -177,7 +195,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@ApiImplicitParam(value = "年月", name = "yearMonth", required = true, dataType = "string"),
- @ApiImplicitParam(value = "记录(1充值 2扣除)", name = "recordId", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "记录(1充值 2扣除)", name = "recordId", required = false, dataType = "int"),
})
public ResultUtil<List<ConsumeDetail>> getUserBillingDetails(String yearMonth,Integer recordId){
try {
@@ -197,10 +215,10 @@
@ApiOperation(value = "充值明细", tags = {"APP-使用福利"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
- @ApiImplicitParam(value = "年月", name = "yearMonth", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "年月", name = "yearMonth", required = false, dataType = "string"),
@ApiImplicitParam(value = "页码", name = "pageNum", required = true, dataType = "int"),
@ApiImplicitParam(value = "每页数量", name = "pageSize", required = true, dataType = "int"),
- @ApiImplicitParam(value = "记录(1充值 2扣除)", name = "recordId", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "记录(1充值 2扣除)", name = "recordId", required = false, dataType = "int"),
})
public ResultUtil<List<RechargesDetail>> wpGoldRechargeRecord(String yearMonth, Integer recordId,Integer pageNum,Integer pageSize){
try {
@@ -217,7 +235,7 @@
@ResponseBody
- @PostMapping("/base/useBenefit/voucherCenter")
+ @PostMapping("/api/useBenefit/voucherCenter")
@ApiOperation(value = "充值中心", tags = {"APP-使用福利"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@@ -352,20 +370,14 @@
@ApiOperation(value = "积分商城-商品兑换", tags = {"APP-使用福利"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
- @ApiImplicitParam(value = "商品id", name = "goodId", required = true, dataType = "int"),
- @ApiImplicitParam(value = "商品类型 1实物 2课包 3门票 4优惠券", name = "goodsType", required = true, dataType = "int"),
- @ApiImplicitParam(value = "兑换数量", name = "nums", required = false, dataType = "int"),
- @ApiImplicitParam(value = "兑换方式(1=积分，2=积分+现金)", name = "exchangeType", required = true, dataType = "int"),
- @ApiImplicitParam(value = "现金支付方式(1=微信 2=支付宝)", name = "payType", required = false, dataType = "int"),
- @ApiImplicitParam(value = "学员id列表", name = "stuIds", required = false),
})
- public ResultUtil productRedemptionOperation(Integer goodId, Integer goodsType,Integer nums,Integer exchangeType,Integer payType,List<Integer> stuIds){
+ public ResultUtil productRedemptionOperation(GoodsExchangeVo exchangeType){
try {
Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
if(null == userIdFormRedis){
return ResultUtil.tokenErr();
}
- return tauService.productRedemptionOperation(userIdFormRedis,goodId,goodsType,nums,exchangeType,payType,stuIds);
+ return tauService.productRedemptionOperation(userIdFormRedis,exchangeType);
}catch (Exception e){
return ResultUtil.runErr();
}
@@ -380,10 +392,10 @@
@ApiOperation(value = "积分商城-积分明细", tags = {"APP-使用福利"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
- @ApiImplicitParam(value = "年月", name = "yearMonth", required = true, dataType = "string"),
- @ApiImplicitParam(value = "记录(1充值 2扣除)", name = "recordId", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "年月", name = "yearMonth", required = false, dataType = "string"),
+ @ApiImplicitParam(value = "记录(1充值 2扣除)", name = "recordId", required = false, dataType = "int"),
})
- public ResultUtil<IntegralDetailsResponse> pointDetails(String yearMonth, Integer recordId){
+ public ResultUtil<List<IntegralsData>> pointDetails(String yearMonth, Integer recordId){
try {
Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
if(null == userIdFormRedis){
@@ -404,8 +416,8 @@
@ApiOperation(value = "积分商城-兑换记录", tags = {"APP-使用福利"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
- @ApiImplicitParam(value = "使用状态 （1已使用 2未使用）", name = "useType", required = true, dataType = "string"),
- @ApiImplicitParam(value = "商品类型 1实物 2课包 3门票 4优惠券", name = "goodType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "使用状态 （1已使用 2未使用）", name = "useType", required = false, dataType = "string"),
+ @ApiImplicitParam(value = "商品类型 1实物 2课包 3门票 4优惠券", name = "goodType", required = false, dataType = "int"),
})
public ResultUtil<List<ExchangeDetailsResponse>> exchangeRecordsDetails(Integer useType, Integer goodType){
try {
@@ -430,7 +442,7 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@ApiImplicitParam(value = "记录id", name = "detailsId", required = true, dataType = "string"),
})
- public ResultUtil<PointDetailsVo> redemptionDetails(Integer detailsId){
+ public ResultUtil<PointDetailsVo> redemptionDetails(Long detailsId){
try {
return ResultUtil.success(uicService.queryRedemptionDetails(detailsId));
}catch (Exception e){
--
Gitblit v1.7.1