!350 fix & improve

Merge pull request !350 from OceansDeep/pg
caowei312502 · Jun 17, 2024 · 6b59c1e · 6b59c1e
2 parents 7635198 + 1b52381
commit 6b59c1e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 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
@@ -286,7 +286,7 @@ public Token refreshStoreToken(String refreshToken) {
     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
@@ -29,7 +29,7 @@
 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 @@
  * @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 List<MemberCoupon> trigger(CouponActivityTrigger couponActivityTrigger) {
 
 
         //优惠券发放列表
+        log.info("当前用户的优惠券活动信息:{}", couponActivityTrigger);
+        log.info("当前进行的优惠券活动:{}", couponActivities);
         List<CouponActivityItemVO> couponActivityItemVOS = new ArrayList<>();
 
         //准备发放优惠券活动的列表