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/OrderMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index 2043d0b..c0be05f 100644
--- a/src/main/resources/mapper/payment/OrderMapper.xml
+++ b/src/main/resources/mapper/payment/OrderMapper.xml
@@ -7,6 +7,10 @@
where status_backend = 'SEND' and partner_id is not null
</update>
+ <select id="getPartnerOrderReceive" resultType="com.mzl.flower.entity.payment.Order">
+ select * from t_order t where status_backend = 'SEND' and partner_id is not null
+ </select>
+
<select id="getOrderStatusCount" resultType="com.mzl.flower.dto.response.payment.OrderStatusCountDTO">
SELECT q.status_backend value, count(1) orderCount
FROM t_order q
@@ -197,7 +201,7 @@
</foreach>
</if>
- ORDER BY q.partner_id, q.warehouse_name, q.warehouse_location_code, q.create_time desc, q.payment_time desc
+ ORDER BY q.partner_id DESC, q.warehouse_id, q.warehouse_location_id, q.create_time desc, q.payment_time desc
</select>
<select id="getSupplierSaleNum" resultType="com.mzl.flower.dto.response.payment.SupplierNumDTO">
--
Gitblit v1.9.3