全部代码、数据库提交

无关风月

2025-01-22 99367ea1c11a68b420936e7f7db5fa7367da4f44

 xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/management/MgtOrderController.java

@@ -10,6 +10,8 @@
import com.xinquan.common.core.utils.page.CollUtils;
import com.xinquan.common.core.utils.page.PageDTO;
import com.xinquan.common.core.web.page.PageInfo;
import com.xinquan.common.log.annotation.Log;
import com.xinquan.common.log.enums.BusinessType;
import com.xinquan.common.security.service.TokenService;
import com.xinquan.course.api.domain.Course;
import com.xinquan.course.api.feign.RemoteCourseService;
@@ -44,6 +46,7 @@
import java.io.IOException;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -159,9 +162,10 @@
        if (status!=0){
            orderLambdaQueryWrapper.eq(Order::getPaymentStatus, status);
        }
        orderLambdaQueryWrapper.eq(Order::getPaymentStatus, 2);
        if (status!=0){
            orderLambdaQueryWrapper.eq(Order::getPaymentStatus, status);
        }
        orderLambdaQueryWrapper.in(Order::getOrderFrom,longs);
        orderLambdaQueryWrapper.ne(Order::getRefundStatus, 3);
        List<Order> list = orderService.list(orderLambdaQueryWrapper);
        return R.ok(list);
    }
@@ -172,8 +176,8 @@
        String endTime = null;
        if (org.springframework.util.StringUtils.hasLength(courseDTO.getTime())){
            String[] split = courseDTO.getTime().split(" - ");
            startTime = split[0]+"00:00:00";
            endTime = split[1]+"23:59:59";
            startTime = split[0]+" 00:00:00";
            endTime = split[1]+" 23:59:59";
        }
        List<Integer> payType1 = new ArrayList<>();
        payType1.add(1);
@@ -184,38 +188,23 @@
        List<Integer> payType3 = new ArrayList<>();
        payType3.add(3);
        payType3.add(7);
        List<Integer> payType4 = new ArrayList<>();
        payType3.add(4);
        payType3.add(5);
        payType3.add(6);
        payType3.add(7);

        LambdaQueryWrapper<Order> courseLambdaQueryWrapper = new LambdaQueryWrapper<>();
        if (StringUtils.hasLength(courseDTO.getIds())){
            courseLambdaQueryWrapper.in(Order::getId, Arrays.asList(courseDTO.getIds().split(",")));
        if (startTime!=null){
            courseLambdaQueryWrapper.between(Order::getCreateTime, startTime, endTime);
        }
        courseLambdaQueryWrapper.between(Order::getCreateTime, startTime, endTime);
        if (courseDTO.getPayType()!=null){
            switch (courseDTO.getPayType()){
                case 1:
                    courseLambdaQueryWrapper.in(Order::getPayType,payType1);
                    break;
                case 2:
                    courseLambdaQueryWrapper.in(Order::getPayType,payType2);
                    break;
                case 3:
                    courseLambdaQueryWrapper.in(Order::getPayType,payType3);
                    break;
                case 4:
                    courseLambdaQueryWrapper.in(Order::getPayType,payType4);
                    break;
            }
            courseLambdaQueryWrapper.eq(Order::getPayType, courseDTO.getPayType());
        }
        courseLambdaQueryWrapper.eq(courseDTO.getPaymentStatus()!=null,Order::getPaymentStatus, courseDTO.getPaymentStatus());
        courseLambdaQueryWrapper.eq(courseDTO.getOrderFrom()!=null,Order::getOrderFrom, courseDTO.getOrderFrom());
        courseLambdaQueryWrapper.eq(courseDTO.getUid()!=null&&(!courseDTO.getUid().isEmpty()),Order::getAppUserId, courseDTO.getUid());
        if (courseDTO.getPaymentStatus()!=null){
            courseLambdaQueryWrapper.eq(Order::getPaymentStatus, courseDTO.getPaymentStatus());
        }
        if (courseDTO.getOrderFrom()!=null){
            courseLambdaQueryWrapper.eq(Order::getOrderFrom, courseDTO.getOrderFrom());
        }
        if (org.springframework.util.StringUtils.hasLength(courseDTO.getBuyContent())){
            // 查询购买内容
            List<Long> collect1 = orderService.lambdaQuery().like(Order::getVipType, courseDTO.getBuyContent()).list().stream()
            List<Long> collect1 = orderService.lambdaQuery().like(Order::getBuyContent, courseDTO.getBuyContent()).list().stream()
                    .map(Order::getId).collect(Collectors.toList());
            List<Long> collect2 = orderService.lambdaQuery().like(Order::getBizOrderNo, courseDTO.getBuyContent()).list().stream()
                    .map(Order::getId).collect(Collectors.toList());
@@ -258,8 +247,8 @@
        }

        List<Order> page = orderService.list(courseLambdaQueryWrapper);

        List<AppUserWithdraw> data2 = remoteAppUserService.getWithdraw(courseDTO).getData();
        List<WaterExport> waterExports = new ArrayList<>();
        for (AppUserWithdraw appUserWithdraw : data2) {
            Order order = new Order();
            order.setId(appUserWithdraw.getId());
@@ -277,6 +266,58 @@
            order.setCreateTime(appUserWithdraw.getCreateTime());
            page.add(order);
        }
        Page<Order> objectPage = new Page<>();
        objectPage.setTotal(page.size());
        objectPage.setCurrent(courseDTO.getPageCurr());
        objectPage.setSize(courseDTO.getPageSize());
        for (Order record : page) {
            record.setUid(record.getId().toString());
            record.setPlatformMoney(record.getRealPayAmount()!=null?record.getRealPayAmount():record.getTotalAmount().subtract(record.getCommissionAmount()==null?BigDecimal.ZERO:record.getCommissionAmount()));
            AppUser byId1 = remoteAppUserService.getAppUserById(record.getAppUserId()+"").getData();
            if (Objects.nonNull(byId1)){
                record.setUserName(byId1.getNickname());
                record.setCellPhone(byId1.getCellPhone());
            }
            if (record.getOrderFrom()!=null){
                switch (record.getOrderFrom()){
                    case 1:
                        Meditation data = remoteMeditationService.getMeditationById(record.getBusinessId()).getData();
                        if (data!=null){
                            record.setCategoryMeditationName(data.getCategoryName());
                            record.setMeditationTitle(data.getMeditationTitle());
                            record.setIconUrl(data.getCoverUrl());
                            record.setDetailDescription(data.getDetailDescription());
                            record.setGeneralPriceMeditation(data.getGeneralPrice());
                            record.setListingStatusMeditation(data.getListingStatus());
                            record.setMeditationUid(data.getId()+"");
                        }
                        break;
                    case 2:
                        Course data1 = remoteCourseService.getCourseById(record.getBusinessId()).getData();
                        if (data1!=null){
                            record.setCategoryCourseName(data1.getCategoryName());
                            record.setCourseTitle(data1.getCourseTitle());
                            record.setCoverUrl(data1.getCoverUrl());
                            record.setTutor(data1.getTutor());
                            record.setCourseChapterCount(data1.getCourseChapterCount());
                            record.setGeneralPriceCourse(data1.getGeneralPrice());
                            record.setListingStatusCourse(data1.getListingStatus());
                            record.setCourseUid(data1.getId()+"");
                        }
                        break;
                    case 3:
                        record.setBuyContent(record.getBuyContent());
                        record.setGeneralPriceVip(record.getTotalAmount());
                        break;
                    case 4:
                        record.setBuyContent("充值");
                        record.setPlatformMoney(record.getRealPayAmount()!=null?record.getRealPayAmount()
                                .subtract(record.getCommissionAmount()!=null?record.getCommissionAmount():BigDecimal.ZERO):BigDecimal.ZERO);
                        break;
                }
            }
        }
        List<WaterExport> waterExports = new ArrayList<>();
        for (Order record : page) {
            record.setUid(record.getId().toString());
            record.setPlatformMoney(record.getRealPayAmount().subtract(record.getCommissionAmount()==null?BigDecimal.ZERO:record.getCommissionAmount()));
@@ -313,13 +354,13 @@
                        }
                        break;
                    case 3:
                        record.setBuyContent(record.getVipType());
                        record.setBuyContent(record.getBuyContent());
                        record.setGeneralPriceVip(record.getRealPayAmount());
                        break;
                    case 4:
                        record.setBuyContent("余额充值");
                        record.setPlatformMoney(record.getRealPayAmount()!=null?record.getRealPayAmount()
                                .subtract(record.getCommissionAmount()!=null?record.getCommissionAmount():BigDecimal.ZERO):BigDecimal.ZERO);
                        record.setPlatformMoney((record.getRealPayAmount()!=null?record.getRealPayAmount():record.getTotalAmount())
                                .subtract(record.getCommissionAmount()!=null?record.getCommissionAmount():BigDecimal.ZERO));
                        break;
                }
            }
@@ -331,9 +372,16 @@
                waterExport.setUserName(byId1.getNickname());
                waterExport.setCellphone(byId1.getCellPhone());
            }
            waterExport.setRealPayAmount("￥"+record.getRealPayAmount());
            waterExport.setCommissionAmount("￥"+record.getCommissionAmount());
            waterExport.setPlatformMoney("￥"+record.getPlatformMoney());
            if (record.getPaymentStatus()!=2){
                waterExport.setRealPayAmount("￥"+0);
                waterExport.setCommissionAmount("￥"+0);
                waterExport.setPlatformMoney("￥"+0);
            }else{
                waterExport.setRealPayAmount("￥"+record.getRealPayAmount());
                waterExport.setCommissionAmount("￥"+(record.getCommissionAmount()==null?new BigDecimal("0")+"":record.getCommissionAmount()+""));
                waterExport.setPlatformMoney("￥"+record.getPlatformMoney());
            }

            waterExport.setBuyContent(record.getBuyContent());
            waterExport.setOrderFrom(record.getOrderFrom()+"");
            waterExport.setPayType(record.getPayType());
@@ -341,6 +389,7 @@
            String format = df.format(record.getCreateTime());
            waterExport.setCreateTime(format);
            waterExport.setPaymentStatus(record.getPaymentStatus()+"");
            waterExports.add(waterExport);
        }

        Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), WaterExport.class, waterExports);
@@ -376,49 +425,29 @@
            startTime = split[0]+" 00:00:00";
            endTime = split[1]+" 23:59:59";
        }
        List<Integer> payType1 = new ArrayList<>();
        payType1.add(1);
        payType1.add(5);
        List<Integer> payType2 = new ArrayList<>();
        payType2.add(2);
        payType2.add(6);
        List<Integer> payType3 = new ArrayList<>();
        payType3.add(3);
        payType3.add(7);
        List<Integer> payType4 = new ArrayList<>();
        payType4.add(4);
        payType4.add(5);
        payType4.add(6);
        payType4.add(7);


        LambdaQueryWrapper<Order> courseLambdaQueryWrapper = new LambdaQueryWrapper<>();
        if (startTime!=null){
            courseLambdaQueryWrapper.between(Order::getCreateTime, startTime, endTime);
        }
        if (courseDTO.getPayType()!=null){
            switch (courseDTO.getPayType()){
                case 1:
                    courseLambdaQueryWrapper.in(Order::getPayType,payType1);
                    break;
                case 2:
                    courseLambdaQueryWrapper.in(Order::getPayType,payType2);
                    break;
                case 3:
                    courseLambdaQueryWrapper.in(Order::getPayType,payType3);
                    break;
                case 4:
                    courseLambdaQueryWrapper.in(Order::getPayType,payType4);
                    break;
        if (StringUtils.hasLength(courseDTO.getPayType())){
            courseLambdaQueryWrapper.in(Order::getPayType,Arrays.asList(courseDTO.getPayType().split(",")));
        }
        if (StringUtils.hasLength(courseDTO.getPaymentStatus())){
            if (courseDTO.getPaymentStatus().equals("4")){
                courseLambdaQueryWrapper.eq(Order::getRefundStatus,3);
            }else{
                courseLambdaQueryWrapper.in(Order::getPaymentStatus, Arrays.asList(courseDTO.getPaymentStatus().split(",")));

            }
        }
        if (courseDTO.getPaymentStatus()!=null){
            courseLambdaQueryWrapper.eq(Order::getPaymentStatus, courseDTO.getPaymentStatus());
        }
        if (courseDTO.getOrderFrom()!=null){
            courseLambdaQueryWrapper.eq(Order::getOrderFrom, courseDTO.getOrderFrom());
        if (StringUtils.hasLength(courseDTO.getOrderFrom())){
            courseLambdaQueryWrapper.in(Order::getOrderFrom, Arrays.asList(courseDTO.getOrderFrom().split(",")));
        }
        if (org.springframework.util.StringUtils.hasLength(courseDTO.getBuyContent())){
            // 查询购买内容
            List<Long> collect1 = orderService.lambdaQuery().like(Order::getVipType, courseDTO.getBuyContent()).list().stream()
            List<Long> collect1 = orderService.lambdaQuery().like(Order::getBuyContent, courseDTO.getBuyContent()).list().stream()
                    .map(Order::getId).collect(Collectors.toList());
            List<Long> collect2 = orderService.lambdaQuery().like(Order::getBizOrderNo, courseDTO.getBuyContent()).list().stream()
                    .map(Order::getId).collect(Collectors.toList());
@@ -461,10 +490,7 @@
        }

        List<Order> page = orderService.list(courseLambdaQueryWrapper);
        Page<Order> objectPage = new Page<>();
        objectPage.setTotal(page.size());
        objectPage.setCurrent(courseDTO.getPageCurr());
        objectPage.setSize(courseDTO.getPageSize());

        List<AppUserWithdraw> data2 = remoteAppUserService.getWithdraw(courseDTO).getData();
        for (AppUserWithdraw appUserWithdraw : data2) {
            Order order = new Order();
@@ -476,6 +502,12 @@
            order.setOrderFrom(5);
            order.setPaymentStatus(appUserWithdraw.getWithdrawStatus()+1);
            order.setPayType(4);
            // 提现订单
            if (appUserWithdraw.getWithdrawStatus()==2){
                order.setRefundStatus(3);
            }else{
                order.setRefundStatus(1);
            }
            order.setTotalAmount(appUserWithdraw.getAmount());
            order.setRealPayAmount(appUserWithdraw.getAmount());
            order.setPlatformMoney(appUserWithdraw.getAmount().multiply(new BigDecimal("-1")));
@@ -483,9 +515,14 @@
            order.setCreateTime(appUserWithdraw.getCreateTime());
            page.add(order);
        }
        Page<Order> objectPage = new Page<>();
        objectPage.setTotal(page.size());
        objectPage.setCurrent(courseDTO.getPageCurr());
        objectPage.setSize(courseDTO.getPageSize());
        for (Order record : page) {

            record.setUid(record.getId().toString());
            record.setPlatformMoney(record.getRealPayAmount().subtract(record.getCommissionAmount()==null?BigDecimal.ZERO:record.getCommissionAmount()));
            record.setPlatformMoney((record.getRealPayAmount()!=null?record.getRealPayAmount():record.getTotalAmount()).subtract(record.getCommissionAmount()==null?BigDecimal.ZERO:record.getCommissionAmount()));
            AppUser byId1 = remoteAppUserService.getAppUserById(record.getAppUserId()+"").getData();
            if (Objects.nonNull(byId1)){
                record.setUserName(byId1.getNickname());
@@ -519,15 +556,19 @@
                        }
                        break;
                    case 3:
                        record.setBuyContent(record.getVipType());
                        record.setGeneralPriceVip(record.getRealPayAmount());
                        record.setBuyContent(record.getBuyContent());
                        record.setGeneralPriceVip(record.getTotalAmount());
                        break;
                    case 4:
                        record.setBuyContent("充值");
                        record.setPlatformMoney(record.getRealPayAmount()!=null?record.getRealPayAmount()
                                .subtract(record.getCommissionAmount()!=null?record.getCommissionAmount():BigDecimal.ZERO):BigDecimal.ZERO);

                        break;
                }
            }
            if (record.getPaymentStatus()!=2){
                record.setPlatformMoney(null);
                record.setRealPayAmount(null);
                record.setCommissionAmount(null);
            }
        }
        // 手动分页
@@ -570,47 +611,30 @@
        String endTime = null;
        if (org.springframework.util.StringUtils.hasLength(courseDTO.getTime())){
            String[] split = courseDTO.getTime().split(" - ");
            startTime = split[0]+"00:00:00";
            endTime = split[1]+"23:59:59";
            startTime = split[0]+" 00:00:00";
            endTime = split[1]+" 23:59:59";
        }
        List<Integer> payType1 = new ArrayList<>();
        payType1.add(1);
        payType1.add(5);
        List<Integer> payType2 = new ArrayList<>();
        payType2.add(2);
        payType2.add(6);
        List<Integer> payType3 = new ArrayList<>();
        payType3.add(3);
        payType3.add(7);
        List<Integer> payType4 = new ArrayList<>();
        payType3.add(4);
        payType3.add(5);
        payType3.add(6);
        payType3.add(7);
        LambdaQueryWrapper<Order> courseLambdaQueryWrapper = new LambdaQueryWrapper<>();
        courseLambdaQueryWrapper.between(Order::getCreateTime, startTime, endTime);
        if (courseDTO.getPayType()!=null){
            switch (courseDTO.getPayType()){
                case 1:
                    courseLambdaQueryWrapper.in(Order::getPayType,payType1);
                    break;
                case 2:
                    courseLambdaQueryWrapper.in(Order::getPayType,payType2);
                    break;
                case 3:
                    courseLambdaQueryWrapper.in(Order::getPayType,payType3);
                    break;
                case 4:
                    courseLambdaQueryWrapper.in(Order::getPayType,payType4);
                    break;
            }

        if (startTime!=null){
            courseLambdaQueryWrapper.between(Order::getCreateTime, startTime, endTime);
        }
        courseLambdaQueryWrapper.eq(courseDTO.getPaymentStatus()!=null,Order::getPaymentStatus, courseDTO.getPaymentStatus());
        courseLambdaQueryWrapper.eq(courseDTO.getOrderFrom()!=null,Order::getOrderFrom, courseDTO.getOrderFrom());
        if (StringUtils.hasLength(courseDTO.getPayType())){
            courseLambdaQueryWrapper.in(Order::getPayType,Arrays.asList(courseDTO.getPayType().split(",")));
        }
        if (StringUtils.hasLength(courseDTO.getPaymentStatus())){
            if (courseDTO.getPaymentStatus().equals("4")){
                courseLambdaQueryWrapper.eq(Order::getRefundStatus,3);
            }else{
                courseLambdaQueryWrapper.in(Order::getPaymentStatus, Arrays.asList(courseDTO.getPaymentStatus().split(",")));

            }
        }
        if (StringUtils.hasLength(courseDTO.getOrderFrom())){
            courseLambdaQueryWrapper.in(Order::getOrderFrom, Arrays.asList(courseDTO.getOrderFrom().split(",")));
        }
        if (org.springframework.util.StringUtils.hasLength(courseDTO.getBuyContent())){
            // 查询购买内容
            List<Long> collect1 = orderService.lambdaQuery().like(Order::getVipType, courseDTO.getBuyContent()).list().stream()
            List<Long> collect1 = orderService.lambdaQuery().like(Order::getBuyContent, courseDTO.getBuyContent()).list().stream()
                    .map(Order::getId).collect(Collectors.toList());
            List<Long> collect2 = orderService.lambdaQuery().like(Order::getBizOrderNo, courseDTO.getBuyContent()).list().stream()
                    .map(Order::getId).collect(Collectors.toList());
@@ -642,6 +666,7 @@
            }
            courseLambdaQueryWrapper.in(Order::getId,collect);
        }

        courseLambdaQueryWrapper.orderByDesc(Order::getCreateTime);
        if (org.springframework.util.StringUtils.hasLength(courseDTO.getUserNameOrPhone())){
            List<Long> collect = remoteAppUserService.getAppUserByNameOrPhone(courseDTO.getUserNameOrPhone()).getData();
@@ -650,6 +675,7 @@
            }
            courseLambdaQueryWrapper.in(Order::getAppUserId, collect);
        }

        List<Order> page = orderService.list(courseLambdaQueryWrapper);
        List<AppUserWithdraw> data2 = remoteAppUserService.getWithdraw(courseDTO).getData();
        for (AppUserWithdraw appUserWithdraw : data2) {
@@ -662,6 +688,12 @@
            order.setOrderFrom(5);
            order.setPaymentStatus(appUserWithdraw.getWithdrawStatus()+1);
            order.setPayType(4);
            // 提现订单
            if (appUserWithdraw.getWithdrawStatus()==2){
                order.setRefundStatus(3);
            }else{
                order.setRefundStatus(1);
            }
            order.setTotalAmount(appUserWithdraw.getAmount());
            order.setRealPayAmount(appUserWithdraw.getAmount());
            order.setPlatformMoney(appUserWithdraw.getAmount().multiply(new BigDecimal("-1")));
@@ -687,9 +719,7 @@
                        break;
                }
            }
            if (record.getRealPayAmount()!=null&& record.getRefundStatus()!=null && record.getRefundStatus()!=3){
                totalMoney = totalMoney.add(record.getRealPayAmount());
            }
                totalMoney = totalMoney.add(record.getTotalAmount());
        }
        orderCountVO.setTotalCount(page.size());
        orderCountVO.setPayCount(payCount);
@@ -707,8 +737,8 @@
        String endTime = null;
        if (org.springframework.util.StringUtils.hasLength(courseDTO.getTime())){
            String[] split = courseDTO.getTime().split(" - ");
            startTime = split[0]+"00:00:00";
            endTime = split[1]+"23:59:59";
            startTime = split[0]+" 00:00:00";
            endTime = split[1]+" 23:59:59";
        }
        List<Integer> payType1 = new ArrayList<>();
        payType1.add(1);
@@ -720,10 +750,10 @@
        payType3.add(3);
        payType3.add(7);
        List<Integer> payType4 = new ArrayList<>();
        payType3.add(4);
        payType3.add(5);
        payType3.add(6);
        payType3.add(7);
        payType4.add(4);
        payType4.add(5);
        payType4.add(6);
        payType4.add(7);
        LambdaQueryWrapper<Order> courseLambdaQueryWrapper = new LambdaQueryWrapper<>();
        if (StringUtils.hasLength(courseDTO.getIds())){
            courseLambdaQueryWrapper.in(Order::getId, Arrays.asList(courseDTO.getIds().split(",")));
@@ -731,30 +761,21 @@
        if (startTime!=null){
            courseLambdaQueryWrapper.between(Order::getCreateTime, startTime, endTime);
        }
        if (courseDTO.getPayType()!=null){
            switch (courseDTO.getPayType()){
                case 1:
                    courseLambdaQueryWrapper.in(Order::getPayType,payType1);
                    break;
                case 2:
                    courseLambdaQueryWrapper.in(Order::getPayType,payType2);
                    break;
                case 3:
                    courseLambdaQueryWrapper.in(Order::getPayType,payType3);
                    break;
                case 4:
                    courseLambdaQueryWrapper.in(Order::getPayType,payType4);
                    break;
            }
        }
        courseLambdaQueryWrapper.ne(Order::getOrderFrom, 4);
        courseLambdaQueryWrapper.ne(Order::getOrderFrom, 5);
        courseLambdaQueryWrapper.eq(courseDTO.getPaymentStatus()!=null,Order::getPaymentStatus, courseDTO.getPaymentStatus());
        courseLambdaQueryWrapper.eq(courseDTO.getOrderFrom()!=null,Order::getOrderFrom, courseDTO.getOrderFrom());
        if (StringUtils.hasLength(courseDTO.getPayType())){
            courseLambdaQueryWrapper.in(Order::getPayType,Arrays.asList(courseDTO.getPayType().split(",")));
        }
        if (StringUtils.hasLength(courseDTO.getPaymentStatus())){
            courseLambdaQueryWrapper.in(Order::getPaymentStatus, Arrays.asList(courseDTO.getPaymentStatus().split(",")));
        }
        if (StringUtils.hasLength(courseDTO.getOrderFrom())){
            courseLambdaQueryWrapper.in(Order::getPaymentStatus, Arrays.asList(courseDTO.getOrderFrom().split(",")));
        }
        courseLambdaQueryWrapper.eq(courseDTO.getUid()!=null&&(!courseDTO.getUid().isEmpty()),Order::getAppUserId, courseDTO.getUid());
        if (org.springframework.util.StringUtils.hasLength(courseDTO.getBuyContent())){
            // 查询购买内容
            List<Long> collect1 = orderService.lambdaQuery().like(Order::getVipType, courseDTO.getBuyContent()).list().stream()
            List<Long> collect1 = orderService.lambdaQuery().like(Order::getBuyContent, courseDTO.getBuyContent()).list().stream()
                    .map(Order::getId).collect(Collectors.toList());
            List<Long> collect2 = orderService.lambdaQuery().like(Order::getBizOrderNo, courseDTO.getBuyContent()).list().stream()
                    .map(Order::getId).collect(Collectors.toList());
@@ -830,7 +851,7 @@
                        }
                        break;
                    case 3:
                        record.setBuyContent(record.getVipType());
                        record.setBuyContent(record.getBuyContent());
                        record.setGeneralPriceVip(record.getRealPayAmount());
                        break;
                }
@@ -886,44 +907,19 @@
            startTime = split[0]+" 00:00:00";
            endTime = split[1]+" 23:59:59";
        }
        List<Integer> payType1 = new ArrayList<>();
        payType1.add(1);
        payType1.add(5);
        List<Integer> payType2 = new ArrayList<>();
        payType2.add(2);
        payType2.add(6);
        List<Integer> payType3 = new ArrayList<>();
        payType3.add(3);
        payType3.add(7);
        List<Integer> payType4 = new ArrayList<>();
        payType4.add(4);
        payType4.add(5);
        payType4.add(6);
        payType4.add(7);
        LambdaQueryWrapper<Order> courseLambdaQueryWrapper = new LambdaQueryWrapper<>();
        if (startTime!=null){
            courseLambdaQueryWrapper.between(Order::getCreateTime, startTime, endTime);
        }
        if (courseDTO.getPayType()!=null){
            switch (courseDTO.getPayType()){
                case 1:
                    courseLambdaQueryWrapper.in(Order::getPayType,payType1);
                    break;
                case 2:
                    courseLambdaQueryWrapper.in(Order::getPayType,payType2);
                    break;
                case 3:
                    courseLambdaQueryWrapper.in(Order::getPayType,payType3);
                    break;
                case 4:
                    courseLambdaQueryWrapper.in(Order::getPayType,payType4);
                    break;
            }
        if (StringUtils.hasLength(courseDTO.getPayType())){
            courseLambdaQueryWrapper.in(Order::getPayType,Arrays.asList(courseDTO.getPayType().split(",")));
        }
        courseLambdaQueryWrapper.ne(Order::getOrderFrom, 4);
        courseLambdaQueryWrapper.ne(Order::getOrderFrom, 5);
        courseLambdaQueryWrapper.eq(courseDTO.getPaymentStatus()!=null,Order::getPaymentStatus, courseDTO.getPaymentStatus());
        courseLambdaQueryWrapper.eq(courseDTO.getOrderFrom()!=null,Order::getOrderFrom, courseDTO.getOrderFrom());
        if (StringUtils.hasLength(courseDTO.getPaymentStatus())){
            courseLambdaQueryWrapper.in(Order::getPaymentStatus, Arrays.asList(courseDTO.getPaymentStatus().split(",")));
        }
        if (StringUtils.hasLength(courseDTO.getOrderFrom())){
            courseLambdaQueryWrapper.in(Order::getOrderFrom, Arrays.asList(courseDTO.getOrderFrom().split(",")));
        }
        courseLambdaQueryWrapper.eq(courseDTO.getUid()!=null&&(!courseDTO.getUid().isEmpty()),Order::getAppUserId, courseDTO.getUid());
        if (org.springframework.util.StringUtils.hasLength(courseDTO.getBuyContent())){
            // 查询购买内容
@@ -988,6 +984,12 @@
                        if (data!=null){
                            record.setCategoryMeditationName(data.getCategoryName());
                            record.setMeditationTitle(data.getMeditationTitle());
                            String[] split = data.getCoverUrl().split(",");
                            if (split.length>=2){
                                record.setCoverUrl(split[0]);
                            }else {
                                record.setCoverUrl(data.getCoverUrl());
                            }
                            record.setIconUrl(StringUtils.hasLength(data.getCoverUrl())?data.getCoverUrl().split(",")[0]:"");
                            record.setDetailDescription(data.getDetailDescription());
                            record.setGeneralPriceMeditation(record.getRealPayAmount());
@@ -1019,7 +1021,6 @@
    }
    @PostMapping("/orderCount")
    @ApiOperation(value = "订单列表管理列表上方合计数据", tags = {"管理后台-订单列表管理"})

    public R<OrderCountVO> orderCount(@RequestBody OrderListDTO courseDTO) {
        OrderCountVO orderCountVO = new OrderCountVO();
        String startTime = null;
@@ -1029,44 +1030,20 @@
            startTime = split[0]+" 00:00:00";
            endTime = split[1]+" 23:59:59";
        }
        List<Integer> payType1 = new ArrayList<>();
        payType1.add(1);
        payType1.add(5);
        List<Integer> payType2 = new ArrayList<>();
        payType2.add(2);
        payType2.add(6);
        List<Integer> payType3 = new ArrayList<>();
        payType3.add(3);
        payType3.add(7);
        List<Integer> payType4 = new ArrayList<>();
        payType4.add(4);
        payType4.add(5);
        payType4.add(6);
        payType4.add(7);

        LambdaQueryWrapper<Order> courseLambdaQueryWrapper = new LambdaQueryWrapper<>();
        if (startTime!=null){
            courseLambdaQueryWrapper.between(Order::getCreateTime, startTime, endTime);
        }
        if (courseDTO.getPayType()!=null){
            switch (courseDTO.getPayType()){
                case 1:
                    courseLambdaQueryWrapper.in(Order::getPayType,payType1);
                    break;
                case 2:
                    courseLambdaQueryWrapper.in(Order::getPayType,payType2);
                    break;
                case 3:
                    courseLambdaQueryWrapper.in(Order::getPayType,payType3);
                    break;
                case 4:
                    courseLambdaQueryWrapper.in(Order::getPayType,payType4);
                    break;
            }
        if (StringUtils.hasLength(courseDTO.getPayType())){
            courseLambdaQueryWrapper.in(Order::getPayType,Arrays.asList(courseDTO.getPayType().split(",")));
        }
        courseLambdaQueryWrapper.ne(Order::getOrderFrom, 4);
        courseLambdaQueryWrapper.ne(Order::getOrderFrom, 5);
        courseLambdaQueryWrapper.eq(courseDTO.getPaymentStatus()!=null,Order::getPaymentStatus, courseDTO.getPaymentStatus());
        courseLambdaQueryWrapper.eq(courseDTO.getOrderFrom()!=null,Order::getOrderFrom, courseDTO.getOrderFrom());
        if (StringUtils.hasLength(courseDTO.getPaymentStatus())){
            courseLambdaQueryWrapper.in(Order::getPaymentStatus, Arrays.asList(courseDTO.getPaymentStatus().split(",")));
        }
        if (StringUtils.hasLength(courseDTO.getOrderFrom())){
            courseLambdaQueryWrapper.in(Order::getOrderFrom, Arrays.asList(courseDTO.getOrderFrom().split(",")));
        }
        if (org.springframework.util.StringUtils.hasLength(courseDTO.getBuyContent())){
            // 查询购买内容
            List<Long> collect1 = orderService.lambdaQuery().like(Order::getBuyContent, courseDTO.getBuyContent()).list().stream()
@@ -1128,8 +1105,8 @@
                        break;
                }
            }
            if (record.getRealPayAmount()!=null && record.getRefundStatus()!=3){
                totalMoney = totalMoney.add(record.getRealPayAmount());
            if (record.getRealPayAmount()!=null){
                totalMoney = totalMoney.add(record.getTotalAmount());
            }
        }
        orderCountVO.setTotalCount(page.size());
@@ -1143,7 +1120,16 @@
    @GetMapping("/detailOrder")
    @ApiOperation(value = "查看详情订单列表管理", tags = "管理后台-订单列表管理")
    public R<Order> detailOrder(String uid) {
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        Order record = orderService.getById(uid);

        if (record.getGiveUserId()!=null){
            AppUser data1 = remoteAppUserService.getAppUserById(record.getGiveUserId() + "").getData();
            record.setUserNameGive(data1.getNickname());
        }

        record.setPlatformMoney(record.getRealPayAmount()==null?new BigDecimal("0"):(record.getRealPayAmount().subtract(
                record.getCommissionAmount()==null?new BigDecimal("0"):record.getCommissionAmount())));
        if (record.getOrderFrom()!=null){
            switch (record.getOrderFrom()){
                case 1:
@@ -1151,7 +1137,7 @@
                    if (data!=null){
                        record.setCategoryMeditationName(data.getCategoryName());
                        record.setMeditationTitle(data.getMeditationTitle());
                        record.setIconUrl(data.getIconUrl());
                        record.setIconUrl(data.getCoverUrl());
                        record.setDetailDescription(data.getDetailDescription());
                        record.setGeneralPriceMeditation(data.getGeneralPrice());
                        record.setListingStatusMeditation(data.getListingStatus());
@@ -1229,10 +1215,46 @@
                            }
                            break;
                        case 6:
                            record.setPaymentType("支付宝(￥"+record.getRealPayAmount()+")");
                            if (!list.isEmpty()){
                                OrderPaymentRecord orderPaymentRecord = list.get(1);
                                OrderPaymentRecord orderPaymentRecord1 = list.get(0);
                                switch (orderPaymentRecord.getPaymentType()){
                                    case 1:
                                        record.setPaymentType("微信(￥"+(orderPaymentRecord.getPayAmount()==null?"":orderPaymentRecord.getPayAmount())+")"
                                                +" + 余额(￥"+orderPaymentRecord1.getPayAmount()+")");
                                        break;
                                    case 2:
                                        record.setPaymentType("支付宝(￥"+(orderPaymentRecord.getPayAmount()==null?"":orderPaymentRecord.getPayAmount())+")"
                                                +" + 余额(￥"+orderPaymentRecord1.getPayAmount()+")");

                                        break;
                                    case 3:
                                        record.setPaymentType("内购(￥"+(orderPaymentRecord.getPayAmount()==null?"":orderPaymentRecord.getPayAmount())+")"
                                                +" + 余额(￥"+orderPaymentRecord1.getPayAmount()+")");
                                        break;
                                }
                            }
                            break;
                        case 7:
                            record.setPaymentType("内购(￥"+record.getRealPayAmount()+")");
                            if (!list.isEmpty()){
                                OrderPaymentRecord orderPaymentRecord = list.get(1);
                                OrderPaymentRecord orderPaymentRecord1 = list.get(0);
                                switch (orderPaymentRecord.getPaymentType()){
                                    case 1:
                                        record.setPaymentType("微信(￥"+(orderPaymentRecord.getPayAmount()==null?"":orderPaymentRecord.getPayAmount())+")"
                                                +" + 余额(￥"+orderPaymentRecord1.getPayAmount()+")");
                                        break;
                                    case 2:
                                        record.setPaymentType("支付宝(￥"+(orderPaymentRecord.getPayAmount()==null?"":orderPaymentRecord.getPayAmount())+")"
                                                +" + 余额(￥"+orderPaymentRecord1.getPayAmount()+")");

                                        break;
                                    case 3:
                                        record.setPaymentType("内购(￥"+(orderPaymentRecord.getPayAmount()==null?"":orderPaymentRecord.getPayAmount())+")"
                                                +" + 余额(￥"+orderPaymentRecord1.getPayAmount()+")");
                                        break;
                                }
                            }
                            break;
                    }
                }
@@ -1255,13 +1277,21 @@
                }
            }
        }
        if (record.getRefundStatus()==3){
            // 已退款
            record.setPaymentStatus(4);
            record.setCancelTime(record.getRefundTime());
        }
        return R.ok(record);
    }
    @GetMapping("/cancel")
    @ApiOperation(value = "取消订单", tags = "管理后台-订单列表管理")
    @Log(title = "【订单列表管理】取消订单", businessType = BusinessType.UPDATE)

    public R updateState(String uid) {
        Order byId = orderService.getById(uid);
        byId.setPaymentStatus(3);
        byId.setCancelTime(LocalDateTime.now());
        orderService.updateById(byId);
        return R.ok();
    }
@@ -1281,6 +1311,7 @@
    private TokenService tokenService;
    @GetMapping("/ChangeMoney")
    @ApiOperation(value = "改价", tags = "管理后台-订单列表管理")
    @Log(title = "【订单列表管理】改价", businessType = BusinessType.UPDATE)
    public R ChangeMoney(String uid,String amount) {
        Order byId = orderService.getById(uid);
        byId.setChangePrice(new BigDecimal(amount));