From 2a9a9d04384f12be6bce7ce57d2f69a162e84568 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 7 Apr 2026 16:13:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E8=8F=9C=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/czg/order/service/OrderInfoRpcService.java | 3 ++- .../java/com/czg/service/market/mapper/OrderInfoMapper.java | 2 +- .../service/order/service/impl/OrderInfoRpcServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoRpcService.java b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoRpcService.java index dc553c76c..91d85c2e8 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoRpcService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoRpcService.java @@ -5,6 +5,7 @@ import com.czg.account.entity.HandoverRecord; import com.czg.account.vo.HandoverCategoryListVo; import com.czg.account.vo.HandoverProductListVo; +import java.math.BigDecimal; import java.util.List; /** @@ -75,7 +76,7 @@ public interface OrderInfoRpcService { /** * 订单退菜数量 */ - int countReturnDish(Long shopId, String loginTime, String handoverTime); + BigDecimal countReturnDish(Long shopId, String loginTime, String handoverTime); /** * 会员充值金额 退款金额 diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/OrderInfoMapper.java b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/OrderInfoMapper.java index dc05c4abb..74018923c 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/OrderInfoMapper.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/OrderInfoMapper.java @@ -78,7 +78,7 @@ public interface OrderInfoMapper extends BaseMapper { " tb_order_info.shop_id = #{shopId} " + "and tb_order_info.create_time >= #{loginTime} and tb_order_info.create_time <= #{handoverTime} " + "and tb_order_info.paid_time is not null ") - int countReturnDish(Long shopId, String loginTime, String handoverTime); + BigDecimal countReturnDish(Long shopId, String loginTime, String handoverTime); @Select("SELECT " + " SUM(CASE WHEN biz_code IN ('cashIn', 'wechatIn', 'alipayIn', 'adminIn') THEN amount ELSE 0 END) AS recharge," + diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoRpcServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoRpcServiceImpl.java index 33bfa6911..d1c03a327 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoRpcServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoRpcServiceImpl.java @@ -65,7 +65,7 @@ public class OrderInfoRpcServiceImpl implements OrderInfoRpcService { } @Override - public int countReturnDish(Long shopId, String loginTime, String handoverTime) { + public BigDecimal countReturnDish(Long shopId, String loginTime, String handoverTime) { return orderInfoMapper.countReturnDish(shopId, loginTime, handoverTime); }