From 75b60332f174363cfe67f61dea87832be708ac15 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 04 七月 2023 08:37:46 +0800 Subject: [PATCH] 更新部分接口 --- cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 180 insertions(+), 0 deletions(-) diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java index a7abfa4..7f75133 100644 --- a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java +++ b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java @@ -1,15 +1,26 @@ package com.dsh.account.controller; +import com.dsh.account.entity.TAppUser; import com.dsh.account.model.AddAppUserVo; +import com.dsh.account.model.JoinPlayPaiVo; import com.dsh.account.model.LoginSMSCodeVo; import com.dsh.account.model.LoginWeChatVo; +import com.dsh.account.service.IVipPaymentService; import com.dsh.account.service.TAppUserService; +import com.dsh.account.util.PayMoneyUtil; 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; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.PrintWriter; +import java.util.Map; /** * @author zhibing.pu @@ -22,6 +33,15 @@ @Autowired private TAppUserService appUserService; + @Autowired + private PayMoneyUtil payMoneyUtil; + + @Autowired + private IVipPaymentService vipPaymentService; + + @Autowired + private TokenUtil tokenUtil; + @@ -33,6 +53,12 @@ @ApiImplicitParam(value = "电话号码", name = "phone", dataType = "string", required = true) }) public ResultUtil getSMSCode(@RequestBody Integer type, @RequestBody String phone){ + if(ToolUtil.isEmpty(phone)){ + return ResultUtil.paranErr("phone"); + } + if(ToolUtil.isEmpty(type)){ + return ResultUtil.paranErr("type"); + } try { ResultUtil smsCode = appUserService.getSMSCode(type, phone); return smsCode; @@ -66,6 +92,12 @@ @ApiImplicitParam(value = "登录密码", name = "password", dataType = "string", required = true) }) public ResultUtil<String> loginPassword(@RequestBody String phone, @RequestBody String password){ + if(ToolUtil.isEmpty(phone)){ + return ResultUtil.paranErr("phone"); + } + if(ToolUtil.isEmpty(password)){ + return ResultUtil.paranErr("password"); + } try { return appUserService.loginPassword(phone, password); }catch (Exception e){ @@ -116,6 +148,15 @@ @ApiImplicitParam(value = "新密码", name = "password", dataType = "string", required = true) }) public ResultUtil updatePassword(@RequestBody String phone, @RequestBody String code, @RequestBody String password){ + if(ToolUtil.isEmpty(phone)){ + return ResultUtil.paranErr("phone"); + } + if(ToolUtil.isEmpty(code)){ + return ResultUtil.paranErr("code"); + } + if(ToolUtil.isEmpty(password)){ + return ResultUtil.paranErr("password"); + } try { return appUserService.updatePassword(phone, code, password); }catch (Exception e){ @@ -134,6 +175,15 @@ @ApiImplicitParam(value = "新密码", name = "password", dataType = "string", required = true) }) public ResultUtil forgetPassword(@RequestBody String phone, @RequestBody String code, @RequestBody String password){ + if(ToolUtil.isEmpty(phone)){ + return ResultUtil.paranErr("phone"); + } + if(ToolUtil.isEmpty(code)){ + return ResultUtil.paranErr("code"); + } + if(ToolUtil.isEmpty(password)){ + return ResultUtil.paranErr("password"); + } try { return appUserService.updatePassword(phone, code, password); }catch (Exception e){ @@ -144,5 +194,135 @@ + @ResponseBody + @PostMapping("/api/appUser/queryJoinPlayPai") + @ApiOperation(value = "获取加入玩湃首页数据", tags = {"APP-加入玩湃"}) + @ApiImplicitParams({ + @ApiImplicitParam(value = "经度", name = "lon", dataType = "string", required = true), + @ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = true), + @ApiImplicitParam(name = "Authorization", value = "用户token(Bearer +token)", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") + }) + public ResultUtil<JoinPlayPaiVo> queryJoinPlayPai(@RequestBody String lon, @RequestBody String lat){ + if(ToolUtil.isEmpty(lon)){ + return ResultUtil.paranErr("lon"); + } + if(ToolUtil.isEmpty(lat)){ + return ResultUtil.paranErr("lat"); + } + try { + Integer uid = tokenUtil.getUserIdFormRedis(); + if(null == uid){ + return ResultUtil.tokenErr(); + } + JoinPlayPaiVo joinPlayPaiVo = appUserService.queryJoinPlayPai(uid, lon, lat); + return ResultUtil.success(joinPlayPaiVo); + }catch (Exception e){ + e.printStackTrace(); + return ResultUtil.runErr(); + } + } + + + + + @ResponseBody + @PostMapping("/api/appUser/addVipPayment") + @ApiOperation(value = "购买年度会员", tags = {"APP-成为会员"}) + @ApiImplicitParams({ + @ApiImplicitParam(value = "支付方式(1=微信,2=支付宝)", name = "payType", dataType = "int", required = true), + @ApiImplicitParam(name = "Authorization", value = "用户token(Bearer +token)", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") + }) + public ResultUtil addVipPayment(@RequestBody Integer payType){ + if(ToolUtil.isEmpty(payType)){ + return ResultUtil.paranErr("payType"); + } + try { + Integer uid = tokenUtil.getUserIdFormRedis(); + if(null == uid){ + return ResultUtil.tokenErr(); + } + return vipPaymentService.addVipPayment(uid, payType); + }catch (Exception e){ + e.printStackTrace(); + return ResultUtil.runErr(); + } + } + + + + + + + /** + * 购买年度会员支付微信回调 + * @param request + * @param response + */ + @ResponseBody + @PostMapping("/base/appUser/addVipPaymentWeChatCallback") + public void addVipPaymentWeChatCallback(HttpServletRequest request, HttpServletResponse response){ + try { + Map<String, String> map = payMoneyUtil.weixinpayCallback(request); + if(null != map){ + String out_trade_no = map.get("out_trade_no"); + String transaction_id = map.get("transaction_id"); + String result = map.get("result"); + ResultUtil resultUtil = vipPaymentService.addVipPaymentCallback(out_trade_no, transaction_id); + if(resultUtil.getCode() == 200){ + PrintWriter out = response.getWriter(); + out.write(result); + out.flush(); + out.close(); + } + } + }catch (Exception e){ + e.printStackTrace(); + } + } + + + /** + * 购买年度会员支付支付宝回调 + * @param request + * @param response + */ + @ResponseBody + @PostMapping("/base/appUser/addVipPaymentAliCallback") + public void addVipPaymentAliCallback(HttpServletRequest request, HttpServletResponse response){ + try { + Map<String, String> map = payMoneyUtil.alipayCallback(request); + if(null != map){ + String out_trade_no = map.get("out_trade_no"); + String trade_no = map.get("trade_no"); + ResultUtil resultUtil = vipPaymentService.addVipPaymentCallback(out_trade_no, trade_no); + if(resultUtil.getCode() == 200){ + PrintWriter out = response.getWriter(); + out.write("success"); + out.flush(); + out.close(); + } + } + }catch (Exception e){ + e.printStackTrace(); + } + } + + + /** + * 根据用户id获取用户信息 + * @param appUserId + * @return + */ + @ResponseBody + @PostMapping("/base/appUser/queryAppUser") + public TAppUser queryAppUser(@RequestBody Integer appUserId){ + try { + TAppUser appUser = appUserService.getById(appUserId); + return appUser; + }catch (Exception e){ + e.printStackTrace(); + return null; + } + } } -- Gitblit v1.7.1