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/java/com/mzl/flower/service/payment/OrderItemSalesService.java |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java b/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
index c4f3079..e7f77e7 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
@@ -117,6 +117,7 @@
         s.setReason(dto.getReason());
         s.setStatus(Constants.ORDER_SALES_STATUS.PENDING.name());
         s.create(userId);
+        s.setSalesType(dto.getSalesType());
         orderItemSalesMapper.insert(s);
 
         return s.getId();
@@ -350,9 +351,5 @@
         orderItemSalesMapper.updateById(sl);
 
         return oi;
-    }
-
-    private BigDecimal getAmount(BigDecimal amount){
-        return amount == null ? new BigDecimal(0) : amount;
     }
 }

--
Gitblit v1.9.3