From 812c482cd66e43a89d035dc7f2bf9c7f1cfd98b3 Mon Sep 17 00:00:00 2001 From: goupan <goupan@chinapopin.com> Date: 星期三, 17 四月 2024 17:40:23 +0800 Subject: [PATCH] 代码提交 --- common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/OrderMentalTestServiceImpl.java | 19 ++++--------------- 1 files changed, 4 insertions(+), 15 deletions(-) diff --git a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/OrderMentalTestServiceImpl.java b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/OrderMentalTestServiceImpl.java index 66caf56..a8a452c 100644 --- a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/OrderMentalTestServiceImpl.java +++ b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/OrderMentalTestServiceImpl.java @@ -18,6 +18,7 @@ import javax.annotation.Resource; import java.math.BigDecimal; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -77,20 +78,8 @@ MentalTestTopic topic = mentalTestTopicService.getById(topicId); Assert.notNull(topic, "题库不存在"); - // 获取用户是否有后台添加订单 - long isBackCount = this.count( - Wrappers.<OrderMentalTest>lambdaQuery() - .eq(OrderMentalTest::getUserId, userId) - .eq(OrderMentalTest::getGoodsId, topicId) - .eq(OrderMentalTest::getIsBack, 1) - ); - if (isBackCount > 0) { - // 有,则以后全部为后台添加标记 - isBack = true; - } - // 获取用户最近创建的待支付订单 - OrderMentalTest o = this.getOne( + OrderMentalTest o = this.baseMapper.selectOne( Wrappers.<OrderMentalTest>lambdaQuery() .eq(OrderMentalTest::getUserId, userId) .eq(OrderMentalTest::getGoodsId, topicId) @@ -144,8 +133,8 @@ } @Override - public List<Map<String, Object>> getStatOrderList(String dateFormat, String beginTime, String endTime, Long workerId, List<Integer> statusList) { - return this.baseMapper.getStatOrderList(dateFormat, beginTime, endTime, workerId, statusList); + public List<Map<String, Object>> getStatOrderList(String dateFormat, String beginTime, String endTime, Long workerId, List<Integer> statusList, List<String> orderNoList) { + return this.baseMapper.getStatOrderList(dateFormat, beginTime, endTime, workerId, statusList, orderNoList); } } -- Gitblit v1.7.1