From a9d9006890e3d676d751ec3a229619c3ecef8036 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 15 一月 2025 23:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java | 1 +
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java | 1 -
2 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java
index 37fe110..47783e0 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java
@@ -64,7 +64,6 @@
redisService.setCacheObject(getCacheKey(username), retryCount, lockTime, TimeUnit.MINUTES);
throw new ServiceException("密码错误");
}
-
// if (!user.getPassword().equals(password)){
// retryCount = retryCount + 1;
// recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_FAIL_STATUS, String.format("密码输入错误%s次", retryCount));
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
index 5d23be9..aeee681 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -333,6 +333,7 @@
long goodsSaleNum = orderService.getGoodsSaleNum(shoppingCart.getGoodsId(), null, userid);
long count = count(new LambdaQueryWrapper<ShoppingCart>()
.eq(ShoppingCart::getGoodsId, shoppingCart.getGoodsId())
+ .eq(ShoppingCart::getStatus,1)
.eq(ShoppingCart::getAppUserId, userid));
goodsSaleNum += count;
Goods goods = goodsClient.getGoodsById(shoppingCart.getGoodsId()).getData();
--
Gitblit v1.7.1