From 6b7bbf4c2a9470bb9c674dd5a866004e4f061031 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 25 七月 2023 17:45:48 +0800
Subject: [PATCH] 删除管理后台无用代码
---
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 107 insertions(+), 12 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 c7cc931..d0cd7c9 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
@@ -179,7 +179,7 @@
@ApiImplicitParam(value = "年月", name = "yearMonth", required = true, dataType = "string"),
@ApiImplicitParam(value = "记录(1充值 2扣除)", name = "recordId", required = true, 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){
@@ -198,23 +198,26 @@
@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 = "pageNum", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "每页数量", name = "pageSize", required = true, dataType = "int"),
@ApiImplicitParam(value = "记录(1充值 2扣除)", name = "recordId", required = true, 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();
}
}
@ResponseBody
- @PostMapping("/api/useBenefit/voucherCenter")
+ @PostMapping("/base/useBenefit/voucherCenter")
@ApiOperation(value = "充值中心", tags = {"APP-使用福利"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@@ -248,6 +251,7 @@
}
return rechargeRService.rechargeCenPayment(userIdFormRedis,request);
}catch (Exception e){
+ e.printStackTrace();
return ResultUtil.runErr();
}
@@ -263,13 +267,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();
}
@@ -290,6 +290,82 @@
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/goodsOfCourseStore")
+ @ApiOperation(value = "积分商城-实体、门票、优惠券为默认门店|课包为默认学员", tags = {"APP-使用福利"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ @ApiImplicitParam(value = "纬度", name = "lat", required = false, dataType = "String"),
+ @ApiImplicitParam(value = "经度", name = "lon", required = false, dataType = "String"),
+ @ApiImplicitParam(value = "是否为课包商品（1=是 2=否）", name = "isCourse", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "商品id", name = "pointsMerId", required = true, dataType = "int"),
+ })
+ public ResultUtil<StuAndStoreResponse> goodsOfCourseStore(String lat, String lon,Integer isCourse,Integer pointsMerId){
+ try {
+ Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
+ if(null == userIdFormRedis){
+ return ResultUtil.tokenErr();
+ }
+ return ResultUtil.success(tauService.queryAppUserDefaultStuAndStore(userIdFormRedis,pointsMerId,lat,lon,isCourse));
+ }catch (Exception e){
+ return ResultUtil.runErr();
+ }
+ }
+
+
+ /**
+ * 兑换详情(实体、门票、优惠券)中的门店列表
+ */
+ @ResponseBody
+ @PostMapping("/api/useBenefit/exchangeStoreIds")
+ @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 = "goodsType", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "商品id", name = "pointsMerId", required = true, dataType = "int"),
+ })
+ public ResultUtil<List<StoreResponse>> getExchangeStoreIds( Integer goodsType,Integer pointsMerId){
+ try {
+ return ResultUtil.success(tauService.queryStoresOfExchange(goodsType,pointsMerId));
+ }catch (Exception e){
+ return ResultUtil.runErr();
+ }
+ }
+
+
+
+ /**
+ * 商品兑换
+ */
+ @ResponseBody
+ @PostMapping("/api/useBenefit/productRedemptionOperation")
+ @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){
+ try {
+ Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
+ if(null == userIdFormRedis){
+ return ResultUtil.tokenErr();
+ }
+ return tauService.productRedemptionOperation(userIdFormRedis,goodId,goodsType,nums,exchangeType,payType,stuIds);
}catch (Exception e){
return ResultUtil.runErr();
}
@@ -336,8 +412,27 @@
Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
if(null == userIdFormRedis){
return ResultUtil.tokenErr();
- }// TODO: 2023/7/12 查询兑换记录
- return ResultUtil.success();
+ }
+ 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