代码提交

无关风月

2024-11-11 6c19eb74b11c6cbf475d43496b90cdee2a28d8b7

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

@@ -176,19 +176,24 @@
                .orderByDesc(BaseModel::getCreateTime).list();
        List<Order> list = orderService.lambdaQuery().eq(Order::getGiveUserId, userId).list();
        for (Order order : page) {
            OrderCourseVO orderCourseVO = new OrderCourseVO();
            orderCourseVO.setId(order.getId());
            orderCourseVO.setOrderFrom(order.getOrderFrom());
            orderCourseVO.setBusinessId(order.getBusinessId());
            if (order.getAppUserId().equals(userId) && order.getGiveUserId() == null){
                OrderCourseVO orderCourseVO = new OrderCourseVO();
                BeanUtils.copyProperties(order, orderCourseVO);
                orderCourseVO.setBusinessId(order.getBusinessId());
                res.add(orderCourseVO);
            }
            if (order.getGiveUserId()!=null&&order.getGiveUserId().equals(userId)){
                OrderCourseVO orderCourseVO = new OrderCourseVO();
                BeanUtils.copyProperties(order, orderCourseVO);
                orderCourseVO.setBusinessId(order.getBusinessId());
                res.add(orderCourseVO);

            }

        }
        List<OrderCourseVO> res1 = new ArrayList<>();
        for (OrderCourseVO orderCourseVO : res) {
            switch (orderCourseVO.getOrderFrom()){
                case 1:
@@ -202,12 +207,13 @@
                    orderCourseVO.setCount(data1.getRealLearnedNum()+data1.getVirtualLearnedNum());
                    orderCourseVO.setChargeType(data1.getChargeType());
                    orderCourseVO.setCoverDescription(data1.getCoverDescription());
                    res1.add(orderCourseVO);
                    break;
                case 2:
                    OrderCourseVO data = remoteCourseService.getCourseByIdAny(orderCourseVO).getData();
                    Course data4 = remoteCourseService.getCourseById(data.getBusinessId()).getData();
                    if (data==null)continue;
                    BeanUtils.copyProperties(data, orderCourseVO);
                    Course data4 = remoteCourseService.getCourseById(data.getBusinessId()).getData();
                    List<CourseChapter> data2 = remoteCourseService.getChapterByCourseId(orderCourseVO.getBusinessId() + "").getData();
                    int temp = 0 ;
                    for (CourseChapter courseChapter : data2) {
@@ -220,10 +226,11 @@
                        orderCourseVO.setCoverUrl(data4.getCoverUrl());
                        orderCourseVO.setBusinessId(data4.getId());
                    }
                    res1.add(orderCourseVO);
                    break;
            }
        }
        List<OrderCourseVO> testing = testing(res.size(), pageCurr, pageSize, res);
        List<OrderCourseVO> testing = testing(res1.size(), pageCurr, pageSize, res1);
        return R.ok(testing);
    }
    public static List<OrderCourseVO> testing(long total, long current, long size, List<OrderCourseVO> str){
@@ -337,13 +344,15 @@
            @ApiImplicitParam(name = "vipType", value = "订单类型为会员时 必传 会员类型 1月度 2季度 3年度", dataType = "Integer", required = false),
    })
    public R placeOrderApple(
            @RequestParam(value = "targetId") Long targetId,
            @RequestParam(value = "targetId", required = false) Long targetId,
            @RequestParam(value = "orderFrom") Integer orderFrom,
            @RequestParam(value = "receiverId", required = false) Long receiverId,
            @RequestParam(value = "balanceFlag") Integer balanceFlag,
            @RequestParam(value = "amount") BigDecimal amount,
            @RequestParam(value = "vipType") Integer vipType,
            @RequestParam(value = "transactionIdentifier")String transactionIdentifier) throws Exception {
            @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)
            throws Exception {


        return R.ok(orderService.placeOrderApple(targetId, orderFrom, receiverId,