From 2c258c39133435fa0e6e6da85d503982fd5a967d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 10 一月 2025 15:33:26 +0800
Subject: [PATCH] bug修改
---
applet/src/main/java/com/jilongda/applet/service/impl/TAppUserServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/applet/src/main/java/com/jilongda/applet/service/impl/TAppUserServiceImpl.java b/applet/src/main/java/com/jilongda/applet/service/impl/TAppUserServiceImpl.java
index a898bb8..9dfebfa 100644
--- a/applet/src/main/java/com/jilongda/applet/service/impl/TAppUserServiceImpl.java
+++ b/applet/src/main/java/com/jilongda/applet/service/impl/TAppUserServiceImpl.java
@@ -1,8 +1,13 @@
package com.jilongda.applet.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.jilongda.applet.mapper.TCouponMapper;
+import com.jilongda.applet.mapper.TCouponReceiveMapper;
import com.jilongda.applet.model.TAppUser;
import com.jilongda.applet.mapper.TAppUserMapper;
+import com.jilongda.applet.model.TCoupon;
+import com.jilongda.applet.model.TCouponReceive;
import com.jilongda.applet.service.TAppUserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jilongda.applet.utils.RptUtils;
@@ -13,6 +18,9 @@
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -27,9 +35,11 @@
@Service
public class TAppUserServiceImpl extends ServiceImpl<TAppUserMapper, TAppUser> implements TAppUserService {
@Autowired
- private TokenService tokenService;
+ private TCouponMapper couponMapper;
+ @Autowired
+ private TCouponReceiveMapper couponReceiveMapper;
@Override
- public void wxLogin(AppletUserDecodeData appletUserDecodeData) {
+ public TAppUser wxLogin(AppletUserDecodeData appletUserDecodeData) {
// 通过手机号查询用户，是否已存在手动导入用户,包含支付宝用户
TAppUser appUser = this.getOne(Wrappers.lambdaQuery(TAppUser.class)
.eq(TAppUser::getOpenId, appletUserDecodeData.getOpenId())
@@ -37,14 +47,38 @@
if(Objects.isNull(appUser)){
appUser = new TAppUser();
appUser.setPhone(appletUserDecodeData.getPhoneNumber());
- appUser.setAvatar(StringUtils.hasLength(appUser.getAvatar())?appUser.getAvatar():"");
- appUser.setName(StringUtils.hasLength(appUser.getName())?appUser.getName(): RptUtils.around(appletUserDecodeData.getPhoneNumber(),3,4));
+ appUser.setAvatar(StringUtils.hasLength(appUser.getAvatar()) ? appUser.getAvatar() : "");
+ appUser.setName(StringUtils.hasLength(appUser.getName()) ? appUser.getName() : RptUtils.around(appletUserDecodeData.getPhoneNumber(), 3, 4));
appUser.setOpenId(appletUserDecodeData.getOpenId());
this.save(appUser);
+ // 查询有没有注册发放的优惠券活动
+ List<TCoupon> tCoupons = couponMapper.selectList(new LambdaQueryWrapper<TCoupon>()
+ .eq(TCoupon::getType, 1)
+ .eq(TCoupon::getGrantStatus, 1));
+ for (TCoupon tCoupon : tCoupons) {
+ TCouponReceive tCouponReceive = new TCouponReceive();
+ tCouponReceive.setCouponId(tCoupon.getId());
+ tCouponReceive.setUserId(appUser.getId());
+ tCouponReceive.setType(1);
+ tCouponReceive.setAmount(tCoupon.getAmount());
+ tCouponReceive.setStoreId(tCoupon.getStoreId());
+ if (tCoupon.getTime()!=0){
+ tCouponReceive.setEndTime(LocalDateTime.now().plusDays(tCoupon.getTime()));
+ }
+ tCouponReceive.setAmountCondition(tCoupon.getAmountCondition());
+ tCouponReceive.setStatus(1);
+ tCouponReceive.setCouponName(tCoupon.getName());
+ couponReceiveMapper.insert(tCouponReceive);
+ }
}else {
if(appUser.getStatus()!=1){
throw new ServiceException("账号被冻结,请联系管理员");
}
+ appUser.setPhone(appletUserDecodeData.getPhoneNumber());
+ appUser.setAvatar(StringUtils.hasLength(appUser.getAvatar())?appUser.getAvatar():"");
+ appUser.setName(StringUtils.hasLength(appUser.getName())?appUser.getName(): RptUtils.around(appletUserDecodeData.getPhoneNumber(),3,4));
+ this.updateById(appUser);
}
+ return appUser;
}
}
--
Gitblit v1.7.1