chuangte/smart-switch-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

收款人订单列表、0元下单提交

Browse Source
This commit is contained in:
墨大叔 2024-07-27 18:41:48 +08:00
parent cc9be65fb1
commit d9021c7a34
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
View File

@ -331,6 +331,12 @@ public class TransactionBillServiceImpl implements TransactionBillService {
ServiceUtil.assertion(suit == null, "套餐不存在"); ServiceUtil.assertion(suit == null, "套餐不存在");
order.setSuitName(suit.getName()); 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(); long expireTime = TimeUnit.MILLISECONDS.convert(Constants.BILL_UNPAID_TIMEOUT, Constants.BILL_UNPAID_TIMEUNIT) + System.currentTimeMillis();
order.setExpireTime(new Date(expireTime)); order.setExpireTime(new Date(expireTime));

6
smart-switch-service/src/main/java/com/ruoyi/ss/wxPay/service/WxPayService.java
View File

@ -109,9 +109,9 @@ public class WxPayService implements IWxPayService {
ServiceUtil.assertion(!TransactionBillStatus.UNPAID.getStatus().equals(bill.getStatus()), "只能支付未支付的订单"); ServiceUtil.assertion(!TransactionBillStatus.UNPAID.getStatus().equals(bill.getStatus()), "只能支付未支付的订单");
ServiceUtil.assertion(!TransactionBillType.RECHARGE.getType().equals(bill.getType()), "只能支付充值订单"); ServiceUtil.assertion(!TransactionBillType.RECHARGE.getType().equals(bill.getType()), "只能支付充值订单");
SmUserVo user = smUserService.selectSmUserByUserId(bill.getUserId()); // SmUserVo user = smUserService.selectSmUserByUserId(bill.getUserId());
ServiceUtil.assertion(user == null, "用户不存在"); // ServiceUtil.assertion(user == null, "用户不存在");
ServiceUtil.assertion(user.getWxOpenId() == null, "用户微信openId为空"); // ServiceUtil.assertion(user.getWxOpenId() == null, "用户微信openId为空");
// 获取JSAPI所需参数 // 获取JSAPI所需参数
// PrepayRequest request = new PrepayRequest(); // PrepayRequest request = new PrepayRequest();

13
smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppTransactionBillController.java
View File

@ -106,6 +106,19 @@ public class AppTransactionBillController extends BaseController
return getDataTable(list); 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<TransactionBillVo> list = smTransactionBillService.selectSmTransactionBillList(smTransactionBill);
transactionAssembler.assembleChannelName(list);
return getDataTable(list);
}
@ApiOperation("获取订单详情") @ApiOperation("获取订单详情")
@GetMapping("/{billId}") @GetMapping("/{billId}")
@JsonView(JsonViewProfile.AppUser.class) @JsonView(JsonViewProfile.AppUser.class)