代码提交

无关风月

2024-11-11 3444605298a981f8db627d8a4055bc7440beddcf

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

@@ -62,7 +62,7 @@
import java.security.interfaces.ECPublicKey;
import java.time.LocalDateTime;
import java.util.*;

import java.util.stream.Collectors;


/**
@@ -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)
@@ -230,7 +232,15 @@
                    break;
            }
        }
        List<OrderCourseVO> testing = testing(res1.size(), pageCurr, pageSize, res1);
        List<OrderCourseVO> orderCourseVOS = new ArrayList<>();
        List<Long> longs1 = new ArrayList<>();
        for (OrderCourseVO orderCourseVO : res1) {
            if (!longs1.contains(orderCourseVO.getBusinessId())){
                longs1.add(orderCourseVO.getBusinessId());
                orderCourseVOS.add(orderCourseVO);
            }
        }
        List<OrderCourseVO> testing = testing(orderCourseVOS.size(), pageCurr, pageSize, orderCourseVOS);
        return R.ok(testing);
    }
    public static List<OrderCourseVO> testing(long total, long current, long size, List<OrderCourseVO> str){
@@ -348,7 +358,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)
@@ -436,6 +445,7 @@
            case 2:
                if (receiverId!=null){
                    remoteAppUserService.addAppUserCourse(order.getBusinessId(),order.getGiveUserId(),order.getId(),1);
                    remoteAppUserService.addNotice(receiverId+"",order.getBusinessId()+"",order.getAppUserId()+"",order.getTotalAmount()+"");
                }else{
                    // 自己购买
                    remoteAppUserService.addAppUserCourse(order.getBusinessId(),order.getAppUserId(),order.getId(),2);
@@ -457,20 +467,6 @@
        appUserWalletRecord1.setChildAppUserId(order.getAppUserId());
        appUserWalletRecord1.setOrderId(order.getId());
        remoteAppUserService.addBalanceRecord(appUserWalletRecord1);
        switch (orderFrom){
            case 1:

                break;
            case 2:

                if (receiverId!=null){
                    remoteAppUserService.addAppUserCourse(order.getBusinessId(),order.getGiveUserId(),order.getId(),1);
                }else{
                    remoteAppUserService.addAppUserCourse(order.getBusinessId(),userId,order.getId(),1);
                }
                break;
        }

        // 判断订单所属用户是否有上级 是否需要做分佣处理
        AppUser data = remoteAppUserService.getAppUserById(order.getAppUserId() + "").getData();
        BigDecimal realPayAmount = order.getRealPayAmount();