代码提交

无关风月

2024-11-11 89294905b79283bcab3b24e36ff56e535d8b4884

 xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java

@@ -123,7 +123,8 @@
            Meditation data = remoteMeditationService.getMeditationById(byId.getBusinessId()).getData();
            payOrderVO.setTitle(data.getMeditationTitle());
            payOrderVO.setOrderFrom(1);
            payOrderVO.setTargetId(data.getId());
            payOrderVO.setCoverUrl(data.getCoverUrl());
            payOrderVO.setId(data.getId());
            switch (type){
                case 1:
                    payOrderVO.setAmount(data.getGeneralPrice());
@@ -140,7 +141,8 @@
            payOrderVO.setTitle(data.getCourseTitle());
            payOrderVO.setTutor(data.getTutor());
            payOrderVO.setOrderFrom(2);
            payOrderVO.setTargetId(data.getId());
            payOrderVO.setCoverUrl(data.getCoverUrl());
            payOrderVO.setId(data.getId());
            switch (type){
                case 1:
                    payOrderVO.setAmount(data.getGeneralPrice());
@@ -165,10 +167,10 @@
    })
    public R<List<OrderCourseVO>> balanceList(Integer state, Integer pageCurr, Integer pageSize) {
        LoginUser loginUser = tokenService.getLoginUser();
        Long userId = loginUser.getUserid();
        if (loginUser==null){
            return R.tokenError("登录失效");
        }
        Long userId = loginUser.getUserid();
        List<OrderCourseVO> res = new ArrayList<>();
        List<Order> page = orderService.lambdaQuery()
                .eq(Order::getOrderFrom, state)
@@ -348,7 +350,6 @@
            @RequestParam(value = "orderFrom") Integer orderFrom,
            @RequestParam(value = "receiverId", required = false) Long receiverId,
            @RequestParam(value = "balanceFlag", required = false) Integer balanceFlag,
            @RequestParam(value = "payType") Integer payType,
            @RequestParam(value = "amount", required = false) BigDecimal amount,
            @RequestParam(value = "vipType", required = false) Integer vipType,
            @RequestParam(value = "transactionIdentifier")String transactionIdentifier)