From 5ff8fb8bd9d298def47437b24e77c8879cdc37d2 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 14 十一月 2024 09:36:39 +0800
Subject: [PATCH] 1.定时任务-待付款-15分钟 2.领券中心：根据领取次数判断是否已领取 3.付款：优惠券自动领取最大优惠券
---
src/main/resources/mapper/flower/FlowerMapper.xml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/flower/FlowerMapper.xml b/src/main/resources/mapper/flower/FlowerMapper.xml
index 1da83a9..711835b 100644
--- a/src/main/resources/mapper/flower/FlowerMapper.xml
+++ b/src/main/resources/mapper/flower/FlowerMapper.xml
@@ -180,8 +180,11 @@
<choose>
<when test="condition.column != null and condition.column != '' and (condition.recommend == null or condition.zoneId != null)">
<choose>
- <when test="'f.sales'.equals(condition.column) or 'f.stock'.equals(condition.column)">
- order by ${condition.column} desc
+ <when test="'f.sales'.equals(condition.column)">
+ order by ifnull(f.sales, 0) + ifnull(f.real_sales, 0) desc
+ </when>
+ <when test="'f.stock'.equals(condition.column)">
+ order by f.stock desc
</when>
<otherwise>
order by ${condition.column}, f.price
@@ -332,8 +335,11 @@
<choose>
<when test="condition.column != null and condition.column != ''">
<choose>
- <when test="'f.sales'.equals(condition.column) or 'f.stock'.equals(condition.column)">
- order by ${condition.column} desc
+ <when test="'f.sales'.equals(condition.column)">
+ order by ifnull(f.sales, 0) + ifnull(f.real_sales, 0) desc
+ </when>
+ <when test="'f.stock'.equals(condition.column)">
+ order by f.stock desc
</when>
<otherwise>
order by ${condition.column} asc
--
Gitblit v1.9.3