From f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 20:03:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 73 ++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 32 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 76219ff..bc36b4a 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,20 @@
}
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 ? "男" : "女");
+ if(tAppUser.getGender()!=null){
+
+ detailsVo.setSex(tAppUser.getGender() == 1 ? "男" : "女");
+ }
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 +113,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,9 +192,9 @@
@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<BillingDetailsVo> getUserBillingDetails(String yearMonth,Integer recordId){
+ public ResultUtil<List<ConsumeDetail>> getUserBillingDetails(String yearMonth,Integer recordId){
try {
Integer appUserId = tokenUtil.getUserIdFormRedis();
if(null == appUserId){
@@ -197,17 +212,20 @@
@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 = "页码", name = "pageNum", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "每页数量", name = "pageSize", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "记录(1充值 2扣除)", name = "recordId", required = false, dataType = "int"),
})
- public ResultUtil<RechargeDetailsVo> wpGoldRechargeRecord(String yearMonth, Integer recordId){
+ public ResultUtil<List<RechargesDetail>> wpGoldRechargeRecord(String yearMonth, Integer recordId,Integer pageNum,Integer pageSize){
try {
Integer appUserId = tokenUtil.getUserIdFormRedis();
if(null == appUserId){
return ResultUtil.tokenErr();
}
- return ResultUtil.success(rechargeRService.getAppUserRechargeRecord(yearMonth,recordId,appUserId));
+ return ResultUtil.success(rechargeRService.getAppUserRechargeRecord(yearMonth,recordId,appUserId,pageNum,pageSize));
}catch (Exception e){
+ e.printStackTrace();
return ResultUtil.runErr();
}
}
@@ -248,6 +266,7 @@
}
return rechargeRService.rechargeCenPayment(userIdFormRedis,request);
}catch (Exception e){
+ e.printStackTrace();
return ResultUtil.runErr();
}
@@ -263,13 +282,9 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
})
- public ResultUtil<PointMallDetailsResponse> pointsMallList(MallRequest request){
+ public ResultUtil<List<Goods>> pointsMallList(MallRequest request){
try {
- Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
- if(null == userIdFormRedis){
- return ResultUtil.tokenErr();
- }
- return ResultUtil.success(tauService.queryAppUserIntegral(request,userIdFormRedis));
+ return ResultUtil.success(tauService.queryAppUserIntegral(request));
}catch (Exception e){
return ResultUtil.runErr();
}
@@ -331,7 +346,7 @@
@ApiOperation(value = "积分商城-兑换详情(实体、门票、优惠券)中的门店列表", tags = {"APP-使用福利"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
- @ApiImplicitParam(value = "商品类型 1实物 2课包 3门票 4优惠券", name = "lat", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "商品类型 1实物 2课包 3门票 4优惠券", name = "goodsType", required = true, dataType = "String"),
@ApiImplicitParam(value = "商品id", name = "pointsMerId", required = true, dataType = "int"),
})
public ResultUtil<List<StoreResponse>> getExchangeStoreIds( Integer goodsType,Integer pointsMerId){
@@ -352,20 +367,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);
+ return tauService.productRedemptionOperation(userIdFormRedis,exchangeType);
}catch (Exception e){
return ResultUtil.runErr();
}
@@ -380,10 +389,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 +413,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 +439,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