From fd5d67411cc7afa7aff2b0a53da7c8075a20fe03 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 13 May 2025 17:13:58 +0800
Subject: [PATCH] fix: 修改商品类型查询逻辑 - 移除了商品类型为1 和非 3 时对现价不为 0 的限制 - 统一了商品类型查询条件,提高了查询的准确性

---
 src/main/java/cc/mrbird/febs/system/controller/LoginController.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/system/controller/LoginController.java b/src/main/java/cc/mrbird/febs/system/controller/LoginController.java
index 81f7b7f..3f65232 100644
--- a/src/main/java/cc/mrbird/febs/system/controller/LoginController.java
+++ b/src/main/java/cc/mrbird/febs/system/controller/LoginController.java
@@ -100,8 +100,8 @@
 
         //支付统计
         data.put("wechatPay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.WECHAT.getName(), OrderStatusEnum.FINISH.getValue()));
-        data.put("alipayPay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.ALIPAY.getName(), OrderStatusEnum.FINISH.getValue()));
-        data.put("scorePay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.SCORE.getName(), OrderStatusEnum.FINISH.getValue()));
+//        data.put("alipayPay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.ALIPAY.getName(), OrderStatusEnum.FINISH.getValue()));
+//        data.put("scorePay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.SCORE.getName(), OrderStatusEnum.FINISH.getValue()));
         data.put("balancePay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.BALANCE.getName(), OrderStatusEnum.FINISH.getValue()));
 
 
@@ -112,13 +112,13 @@
 
         //会员数据
         data.put("totalMember",mallMemberMapper.selectCount(new QueryWrapper<>()) );
-        QueryWrapper<MallMember> formalMember = new QueryWrapper<>();
-        formalMember.ne("level", AgentLevelEnum.ZERO_LEVEL.name());
-        data.put("formalMember",mallMemberMapper.selectCount(formalMember));
+//        QueryWrapper<MallMember> formalMember = new QueryWrapper<>();
+//        formalMember.ne("level", AgentLevelEnum.ZERO_LEVEL.name());
+//        data.put("formalMember",mallMemberMapper.selectCount(formalMember));
 
-        QueryWrapper<MallMember> informalMember = new QueryWrapper<>();
-        informalMember.eq("level", AgentLevelEnum.ZERO_LEVEL.name());
-        data.put("informalMember",mallMemberMapper.selectCount(informalMember));
+//        QueryWrapper<MallMember> informalMember = new QueryWrapper<>();
+//        informalMember.eq("level", AgentLevelEnum.ZERO_LEVEL.name());
+//        data.put("informalMember",mallMemberMapper.selectCount(informalMember));
 
         QueryWrapper<MallMember> todayMember = new QueryWrapper<>();
         todayMember.like("CREATED_TIME", DateUtil.today());

--
Gitblit v1.9.1