diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java index 5074ca9..4d0f7fb 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java @@ -58,9 +58,10 @@ public class PayController { @GetMapping("accountPay") public Result accountPay(@RequestHeader("token") String token, @RequestParam("orderId") String orderId, - @RequestParam("memberId") String memberId + @RequestParam("memberId") String memberId, + @RequestParam("pwd") String pwd ) { - return payService.accountPay(orderId, memberId, token); + return payService.accountPay(orderId, memberId, token,pwd); } @RequestMapping("groupOrderPay") diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index 50e200f..97ce1c4 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -294,7 +294,7 @@ public class PayService { @Transactional(rollbackFor = Exception.class) - public Result accountPay(String orderId, String memberId, String token) { + public Result accountPay(String orderId, String memberId, String token,String pwd) { if (ObjectUtil.isEmpty(orderId) || ObjectUtil.isEmpty(memberId)) { return Result.fail("参数错误"); } @@ -305,6 +305,19 @@ public class PayService { } + TbUserInfo userInfo= tbUserInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getUserId())); + if(ObjectUtil.isEmpty(userInfo)){ + return Result.fail("未获取到用户信息"); + } + + + + + if(!userInfo.getPwd().equals(MD5Utils.md5(pwd))){ + return Result.fail("支付密码错误"); + } + + if (!"unpaid".equals(orderInfo.getStatus()) && !"paying".equals(orderInfo.getStatus()) ) { return Result.fail("订单出状态异常"); }