From fa4530c5aad79ee375954d0cd42358a20cffdf94 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 18 四月 2024 08:43:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/OrderMentalTestServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 49ec565..662c215 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,7 +18,6 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -78,6 +77,18 @@
MentalTestTopic topic = mentalTestTopicService.getById(topicId);
Assert.notNull(topic, "题库不存在");
+ // 查询题库后台添加的订单
+ long isBackCount = this.count(
+ Wrappers.<OrderMentalTest>lambdaQuery()
+ .eq(OrderMentalTest::getIsBack, true)
+ .eq(OrderMentalTest::getUserId, userId)
+ .eq(OrderMentalTest::getGoodsId, topicId)
+ );
+ if (isBackCount > 0) {
+ // 以后的订单都标记为后台添加
+ isBack = true;
+ }
+
// 获取用户最近创建的待支付订单
OrderMentalTest o = this.baseMapper.selectOne(
Wrappers.<OrderMentalTest>lambdaQuery()
@@ -133,8 +144,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