From d1632e46b772d691e55b4013585bfe61164b8bde Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 10 一月 2025 18:30:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applet/src/main/java/com/jilongda/applet/service/impl/TAppUserServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 fca3a33..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
@@ -47,8 +47,8 @@
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);
// 查询有没有注册发放的优惠券活动
@@ -67,6 +67,7 @@
}
tCouponReceive.setAmountCondition(tCoupon.getAmountCondition());
tCouponReceive.setStatus(1);
+ tCouponReceive.setCouponName(tCoupon.getName());
couponReceiveMapper.insert(tCouponReceive);
}
}else {
--
Gitblit v1.7.1