From c81d766cd91be3b3a24c8db94dcd93c071a66c62 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 14 七月 2023 09:30:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 145 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 140 insertions(+), 5 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 2b9f225..cc1e617 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
@@ -6,6 +6,7 @@
import com.dsh.account.model.vo.userBenefitDetail.*;
import com.dsh.account.service.RechargeRecordsService;
import com.dsh.account.service.TAppUserService;
+import com.dsh.account.service.UserIntegralChangesService;
import com.dsh.account.util.ResultUtil;
import com.dsh.account.util.TokenUtil;
import io.swagger.annotations.ApiImplicitParam;
@@ -16,8 +17,10 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
import java.util.List;
@@ -41,6 +44,9 @@
@Autowired
private RechargeRecordsService rechargeRService;
+
+ @Autowired
+ private UserIntegralChangesService uicService;
private final SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd");
@@ -88,6 +94,26 @@
detailsVo.setMemberLifespan(format1.format(tAppUser.getVipEndTime()));
}
return ResultUtil.success(detailsVo);
+ }catch (Exception e){
+ return ResultUtil.runErr();
+ }
+ }
+
+
+ @ResponseBody
+ @PostMapping("/api/useBenefit/uploadImage")
+ @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")
+ })
+ public ResultUtil uploadAppUserProfile(MultipartFile file, HttpServletRequest request){
+ try {
+ Integer appUserId = tokenUtil.getUserIdFormRedis();
+ if(null == appUserId){
+ return ResultUtil.tokenErr();
+ }
+ return ResultUtil.success(tauService.uploadAppUserHeadImg(appUserId,file,request));
}catch (Exception e){
return ResultUtil.runErr();
}
@@ -206,21 +232,21 @@
}
/**
- * 课时详情-支付
+ * 充值中心-支付
*/
@ResponseBody
- @PostMapping("/api/startCource/payment")
- @ApiOperation(value = "充值中心-支付", tags = {"APP-开始上课"})
+ @PostMapping("/api/useBenefit/payment")
+ @ApiOperation(value = "充值中心-支付", tags = {"APP-使用福利"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
})
- public ResultUtil rechargePayment(RechargePayRequest request){
+ public ResultUtil rechargeCenPayment(RechargePayRequest request){
try {
Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
if(null == userIdFormRedis){
return ResultUtil.tokenErr();
}
- return rechargeRService.rechargePayment(userIdFormRedis,request);
+ return rechargeRService.rechargeCenPayment(userIdFormRedis,request);
}catch (Exception e){
return ResultUtil.runErr();
}
@@ -228,5 +254,114 @@
}
+ /**
+ * 积分商城
+ */
+ @ResponseBody
+ @PostMapping("/api/useBenefit/integralMallList")
+ @ApiOperation(value = "积分商城", tags = {"APP-使用福利"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ })
+ public ResultUtil<PointMallDetailsResponse> pointsMallList(MallRequest request){
+ try {
+ Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
+ if(null == userIdFormRedis){
+ return ResultUtil.tokenErr();
+ }
+ return ResultUtil.success(tauService.queryAppUserIntegral(request,userIdFormRedis));
+ }catch (Exception e){
+ return ResultUtil.runErr();
+ }
+ }
+
+
+ /**
+ * 商品详情
+ */
+ @ResponseBody
+ @PostMapping("/api/useBenefit/goodsDetails")
+ @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"),
+ })
+ public ResultUtil<ProductDetailsVo> productDetails(Integer goodId, Integer goodsType){
+ try {
+ return ResultUtil.success(tauService.productDetails(goodId,goodsType));
+ }catch (Exception e){
+ return ResultUtil.runErr();
+ }
+ }
+
+
+ /**
+ * 积分明细
+ */
+ @ResponseBody
+ @PostMapping("/api/useBenefit/integralDetails")
+ @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"),
+ })
+ public ResultUtil<IntegralDetailsResponse> pointDetails(String yearMonth, Integer recordId){
+ try {
+ Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
+ if(null == userIdFormRedis){
+ return ResultUtil.tokenErr();
+ }
+ return ResultUtil.success(uicService.queryUserPointsDetails(yearMonth,recordId,userIdFormRedis));
+ }catch (Exception e){
+ return ResultUtil.runErr();
+ }
+ }
+
+
+ /**
+ * 兑换记录
+ */
+ @ResponseBody
+ @PostMapping("/api/useBenefit/exchangeRecords")
+ @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"),
+ })
+ public ResultUtil<List<ExchangeDetailsResponse>> exchangeRecordsDetails(Integer useType, Integer goodType){
+ try {
+ Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
+ if(null == userIdFormRedis){
+ return ResultUtil.tokenErr();
+ }
+ return ResultUtil.success(uicService.queryExchangeGoodsdetails(userIdFormRedis,useType,goodType));
+ }catch (Exception e){
+ return ResultUtil.runErr();
+ }
+ }
+
+
+ /**
+ * 兑换记录详情
+ */
+ @ResponseBody
+ @PostMapping("/api/useBenefit/redemptionDetails")
+ @ApiOperation(value = "积分商城-兑换记录详情", tags = {"APP-使用福利"})
+ @ApiImplicitParams({
+ @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){
+ try {
+ return ResultUtil.success(uicService.queryRedemptionDetails(detailsId));
+ }catch (Exception e){
+ return ResultUtil.runErr();
+ }
+ }
+
+
}
--
Gitblit v1.7.1