From a21e7c0c99e35481c0b352763e0f7987eef742bf Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期一, 23 十月 2023 09:45:10 +0800 Subject: [PATCH] 10.23bug2 --- cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 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 3a1ec1d..844723b 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 @@ -90,14 +90,15 @@ detailsVo.setUserImage(tAppUser.getHeadImg()); detailsVo.setUserName(tAppUser.getName()); detailsVo.setUserPhone(tAppUser.getPhone()); + detailsVo.setIsVip(tAppUser.getIsVip()); if(tAppUser.getGender()!=null){ - detailsVo.setSex(tAppUser.getGender() == 1 ? "男" : "女"); } System.out.println("============="+tAppUser); if (tAppUser.getBirthday()!=null){ - detailsVo.setBirthday(format1.format(tAppUser.getBirthday()));} + detailsVo.setBirthday(format1.format(tAppUser.getBirthday())); + } detailsVo.setAddress(tAppUser.getProvince()+tAppUser.getCity()); if(tAppUser.getVipEndTime()!=null){ @@ -315,6 +316,23 @@ + @ResponseBody + @PostMapping("/api/useBenefit/goodsDetailsOne") + @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"), + }) + public ResultUtil<ProductDetailsVo> goodsDetailsOne(Integer goodId){ + try { + return ResultUtil.success(tauService.goodsDetailsOne(goodId)); + }catch (Exception e){ + return ResultUtil.runErr(); + } + } + + + /** * 实体、门票、优惠券为默认门店|课包为默认学员 */ @@ -371,7 +389,7 @@ @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."), }) - public ResultUtil productRedemptionOperation(GoodsExchangeVo exchangeType){ + public synchronized ResultUtil productRedemptionOperation(GoodsExchangeVo exchangeType){ try { Integer userIdFormRedis = tokenUtil.getUserIdFormRedis(); if(null == userIdFormRedis){ -- Gitblit v1.7.1