From 1b52381c7129dd9d14a8fa776c6e8e6ba2944b41 Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Mon, 17 Jun 2024 17:09:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=9A=84=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lili/modules/member/serviceimpl/MemberServiceImpl.java  | 2 +-
 .../promotion/serviceimpl/CouponActivityServiceImpl.java    | 6 ++++--
 2 files changed, 5 insertions(+), 3 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 3d4b71a8..04081748 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
@@ -286,7 +286,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
     public Token mobilePhoneLogin(String mobilePhone) {
         QueryWrapper<Member> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("mobile", mobilePhone);
-        Member member = this.baseMapper.selectOne(queryWrapper);
+        Member member = this.baseMapper.selectOne(queryWrapper, false);
         //如果手机号不存在则自动注册用户
         if (member == null) {
             member = new Member(mobilePhone, UuidUtils.getUUID(), mobilePhone);
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java
index 385cb38e..a173eec5 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java
@@ -29,7 +29,7 @@ import cn.lili.trigger.model.TimeExecuteConstant;
 import cn.lili.trigger.model.TimeTriggerMsg;
 import cn.lili.trigger.util.DelayQueueTools;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import groovy.util.logging.Slf4j;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -46,8 +46,8 @@ import java.util.stream.Collectors;
  * @author Bulbasaur
  * @since 2021/5/20 6:10 下午
  */
-@Slf4j
 @Service
+@Slf4j
 public class CouponActivityServiceImpl extends AbstractPromotionsServiceImpl<CouponActivityMapper, CouponActivity> implements CouponActivityService {
 
     @Autowired
@@ -241,6 +241,8 @@ public class CouponActivityServiceImpl extends AbstractPromotionsServiceImpl<Cou
 
 
         //优惠券发放列表
+        log.info("当前用户的优惠券活动信息:{}", couponActivityTrigger);
+        log.info("当前进行的优惠券活动:{}", couponActivities);
         List<CouponActivityItemVO> couponActivityItemVOS = new ArrayList<>();
 
         //准备发放优惠券活动的列表