From a66c6e550432581194c541b2e5caf976af3a0036 Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Wed, 1 Feb 2023 15:51:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/serviceimpl/MemberServiceImpl.java |  3 +--
 .../cart/render/impl/CheckDataRender.java     | 22 ++++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
index fd43fbe4..f415ee1e 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
@@ -189,8 +189,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
     @Override
     public Token usernameStoreLogin(String username, String password) {
 
-//        Member member = this.findMember(username);
-        Member member = this.getOne(new LambdaQueryWrapper<Member>().eq(Member::getMobile,username));
+        Member member = this.findMember(username);
         //判断用户是否存在
         if (member == null || !member.getDisabled()) {
             throw new ServiceException(ResultCode.USER_NOT_EXIST);
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java
index 76e39c3e..12306fab 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java
@@ -109,6 +109,18 @@ public class CheckDataRender implements CartRenderStep {
             //缓存中的商品信息
             GoodsSku dataSku = goodsSkuService.getGoodsSkuByIdFromCache(cartSkuVO.getGoodsSku().getId());
             Map<String, Object> promotionMap = promotionGoodsService.getCurrentGoodsPromotion(dataSku, tradeDTO.getCartTypeEnum().name());
+
+            //商品上架状态判定
+            if (!GoodsAuthEnum.PASS.name().equals(dataSku.getAuthFlag()) || !GoodsStatusEnum.UPPER.name().equals(dataSku.getMarketEnable())) {
+                //设置购物车未选中
+                cartSkuVO.setChecked(false);
+                //设置购物车此sku商品已失效
+                cartSkuVO.setInvalid(true);
+                //设置失效消息
+                cartSkuVO.setErrorMessage("商品已下架");
+                continue;
+            }
+
             //商品有效性判定
             log.info("dataSku: {}, goodsSku: {}", dataSku, cartSkuVO.getGoodsSku());
             if (dataSku == null || (dataSku.getUpdateTime() != null && dataSku.getUpdateTime().after(cartSkuVO.getGoodsSku().getUpdateTime()))) {
@@ -122,16 +134,6 @@ public class CheckDataRender implements CartRenderStep {
                 cartSkuVOS.add(newCartSkuVO);
                 continue;
             }
-            //商品上架状态判定
-            if (!GoodsAuthEnum.PASS.name().equals(dataSku.getAuthFlag()) || !GoodsStatusEnum.UPPER.name().equals(dataSku.getMarketEnable())) {
-                //设置购物车未选中
-                cartSkuVO.setChecked(false);
-                //设置购物车此sku商品已失效
-                cartSkuVO.setInvalid(true);
-                //设置失效消息
-                cartSkuVO.setErrorMessage("商品已下架");
-                continue;
-            }
             //商品库存判定
             if (dataSku.getQuantity() < cartSkuVO.getNum()) {
                 //设置购物车未选中