From 92fe22d1e6e615750541ef650d815b9576bdf5de Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 09 九月 2024 19:10:06 +0800
Subject: [PATCH] 1、245-小程序-供应商-商品管理-回收站-平台或花农删除的商品全部到回收站，回收站增加恢复和删除的按钮，恢复可以将商品恢复到原来的状态，删除可以将此商品彻底删除 目前在回收站点击编辑上架等功能显示“商品未找到”点击删除也删不了商品 2、 255-小程序-供应商-增加同品类同等级价格排名，方便花农根据排名改价格(前后端修改) 3、252-小程序-花店-首页搜索、交易大厅搜索-1.点击分类显示下拉选择效果 2.热区扩大一些，点击<无法切换
---
src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
index f6b9e26..d944053 100644
--- a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
+++ b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
@@ -26,7 +26,7 @@
</select>
<select id="selectDoItemListByTime" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItemStatisticsDTO">
- SELECT oi.flower_name, oi.flower_level, sum(oi.num) num, sum(oi.supplier_price) price
+ SELECT oi.flower_name, oi.flower_level, sum(oi.num) num, sum(oi.supplier_price*oi.num) price
FROM t_delivery_order_item doi
join t_delivery_order q on q.id = doi.delivery_id
join t_order_item oi on oi.id = doi.order_item_id
@@ -46,6 +46,7 @@
, ois.check_num, ois.check_fee, ois.replace_num, ois.replace_fee, ois.lack_num, ois.lack_fee_supplier lackFee
, ois.station_fee, ois.sales_fee_supplier salesFee, ois.service_fee_rate, ois.service_fee, ois.income_supplier
, o.status_backend, o.create_time orderTime
+ , (select count(1) from t_order_item_sales sa where sa.order_item_id = oi.id) salesNum
FROM t_delivery_order_item doi
join t_delivery_order q on q.id = doi.delivery_id
join t_order o on o.id = q.order_id
@@ -65,7 +66,7 @@
</select>
<select id="getSupplierStatisticsByTime" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItemStatisticsDTO">
- SELECT sum(oi.num) num, sum(oi.supplier_price) price
+ SELECT sum(oi.num) num, sum(oi.supplier_price*oi.num) price
FROM t_delivery_order_item doi
join t_delivery_order q on q.id = doi.delivery_id
join t_order_item oi on oi.id = doi.order_item_id
--
Gitblit v1.9.3