diff --git a/src/main/java/com/sqx/common/aspect/AppApiMethodAspect.java b/src/main/java/com/sqx/common/aspect/AppApiMethodAspect.java index d96f72a6..bc847d02 100644 --- a/src/main/java/com/sqx/common/aspect/AppApiMethodAspect.java +++ b/src/main/java/com/sqx/common/aspect/AppApiMethodAspect.java @@ -37,13 +37,8 @@ public class AppApiMethodAspect { String resultJson = new Gson().toJson(result); //获取request HttpServletRequest request = HttpContextUtils.getHttpServletRequest(); - - MethodSignature signature = (MethodSignature) pjp.getSignature(); -// String className = pjp.getTarget().getClass().getName(); - String methodName = signature.getName(); - - log.info("\n {}\n>>>>>>{}\n>>>>>>Request: {}\n>>>>>>Response: {}" - , request.getRequestURL(), IPUtils.getIpAddr(request), + log.info("\n>>>>>> {} {}\n>>>>>> {}\n>>>>>> Request: {}\n>>>>>> Response: {}", + request.getMethod(), request.getRequestURL(), IPUtils.getIpAddr(request), params, resultJson ); diff --git a/src/main/java/com/sqx/modules/pay/controller/CashController.java b/src/main/java/com/sqx/modules/pay/controller/CashController.java index 4def651f..0b6ea04c 100644 --- a/src/main/java/com/sqx/modules/pay/controller/CashController.java +++ b/src/main/java/com/sqx/modules/pay/controller/CashController.java @@ -471,11 +471,4 @@ public class CashController { } - @GetMapping(value = "/withdraw") - @ApiOperation("发起提现 余额 金钱") - public Result withdraw(Long userId,Double amount) - { - return cashOutService.withdraw(userId,amount); - } - } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/pay/controller/app/AppCashController.java b/src/main/java/com/sqx/modules/pay/controller/app/AppCashController.java index 6aceafba..d3c39b45 100644 --- a/src/main/java/com/sqx/modules/pay/controller/app/AppCashController.java +++ b/src/main/java/com/sqx/modules/pay/controller/app/AppCashController.java @@ -35,12 +35,19 @@ public class AppCashController { @Login @GetMapping(value = "/cashMoney") - @ApiOperation("发起提现") + @ApiOperation("发起提现 余额 金豆") public Result cashMoney(@RequestAttribute("userId") Long userId, Double money) { return cashOutService.cashMoney(userId,money); } + @GetMapping(value = "/withdraw") + @ApiOperation("发起提现 余额 金钱") + public Result withdraw(Long userId,Double amount) + { + return cashOutService.withdraw(userId,amount); + } + @Login @RequestMapping(value = "/selectUserRechargeByUserId", method = RequestMethod.GET) @ApiOperation("查询某个用户充值信息列表") diff --git a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java index 878a289e..ee3f3ba6 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java @@ -405,6 +405,9 @@ public class CashOutServiceImpl extends ServiceImpl impleme return Result.error("请不要输入小于0的数字,请输入正确的提现金额!"); } UserEntity userInfo = userService.queryByUserId(userId); + if(StringUtils.isBlank(userInfo.getZhiFuBao()) || StringUtils.isBlank(userInfo.getZhiFuBaoName())){ + return Result.error(9999,"请先绑定支付宝账号!"); + } //最低提现金额 // CommonInfo one = commonInfoService.findOne(112); // if(one!=null && money