From 7865a1010be2f95faab151d99ecdb095f44c2a08 Mon Sep 17 00:00:00 2001 From: lisy <linlangsur163@163.com> Date: 星期五, 14 七月 2023 16:30:34 +0800 Subject: [PATCH] 修复了积分商城详情页面的门店列表查询;兑换支付todo --- cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 76 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 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 cc1e617..76219ff 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 @@ -296,6 +296,82 @@ } + + /** + * 实体、门票、优惠券为默认门店|课包为默认学员 + */ + @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 = "lat", 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); + }catch (Exception e){ + return ResultUtil.runErr(); + } + } + + /** * 积分明细 */ -- Gitblit v1.7.1