From d9021c7a340b0b0273382b29cbff72bbf42a65e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com> Date: Sat, 27 Jul 2024 18:41:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E6=AC=BE=E4=BA=BA=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E3=80=810=E5=85=83=E4=B8=8B=E5=8D=95?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TransactionBillServiceImpl.java | 6 ++++++ .../com/ruoyi/ss/wxPay/service/WxPayService.java | 6 +++--- .../app/AppTransactionBillController.java | 13 +++++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java index 6ea3ae05..1b8b0212 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java @@ -331,6 +331,12 @@ public class TransactionBillServiceImpl implements TransactionBillService { ServiceUtil.assertion(suit == null, "套餐不存在"); order.setSuitName(suit.getName()); + // 用户信息 + SmUserVo user = userService.selectSmUserByUserId(data.getUserId()); + ServiceUtil.assertion(user == null, "用户不存在"); + ServiceUtil.assertion(user.getWxOpenId() == null, "用户微信openId为空"); + order.setAccountNo(user.getWxOpenId()); + // 支付过期时间 long expireTime = TimeUnit.MILLISECONDS.convert(Constants.BILL_UNPAID_TIMEOUT, Constants.BILL_UNPAID_TIMEUNIT) + System.currentTimeMillis(); order.setExpireTime(new Date(expireTime)); diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/wxPay/service/WxPayService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/wxPay/service/WxPayService.java index 8a6239c2..e81dd4a8 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/wxPay/service/WxPayService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/wxPay/service/WxPayService.java @@ -109,9 +109,9 @@ public class WxPayService implements IWxPayService { ServiceUtil.assertion(!TransactionBillStatus.UNPAID.getStatus().equals(bill.getStatus()), "只能支付未支付的订单"); ServiceUtil.assertion(!TransactionBillType.RECHARGE.getType().equals(bill.getType()), "只能支付充值订单"); - SmUserVo user = smUserService.selectSmUserByUserId(bill.getUserId()); - ServiceUtil.assertion(user == null, "用户不存在"); - ServiceUtil.assertion(user.getWxOpenId() == null, "用户微信openId为空"); +// SmUserVo user = smUserService.selectSmUserByUserId(bill.getUserId()); +// ServiceUtil.assertion(user == null, "用户不存在"); +// ServiceUtil.assertion(user.getWxOpenId() == null, "用户微信openId为空"); // 获取JSAPI所需参数 // PrepayRequest request = new PrepayRequest(); diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppTransactionBillController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppTransactionBillController.java index d822899d..407f743d 100644 --- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppTransactionBillController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppTransactionBillController.java @@ -106,6 +106,19 @@ public class AppTransactionBillController extends BaseController return getDataTable(list); } + @ApiOperation("查询本人收款的订单列表") + @GetMapping("/incomeList") + @JsonView(JsonViewProfile.AppMch.class) + public TableDataInfo incomeList(TransactionBillQuery smTransactionBill) + { + startPage(); + smTransactionBill.setMchId(getUserId()); + smTransactionBill.setType(TransactionBillType.RECHARGE.getType()); + List list = smTransactionBillService.selectSmTransactionBillList(smTransactionBill); + transactionAssembler.assembleChannelName(list); + return getDataTable(list); + } + @ApiOperation("获取订单详情") @GetMapping("/{billId}") @JsonView(JsonViewProfile.AppUser.class)