From 8580866e175ad0050ee9c5ea3f757856fc242c39 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 09 五月 2025 10:50:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
index 81388c7..8bc77a0 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
@@ -160,13 +160,14 @@
templateCode = "SMS_482775061";//修改密码
break;
}
- String sData = aLiSendSms.sendSms(phone, templateCode, "{\"code\":\"" + authCode + "\"}");
- JSONObject jsonObject = JSON.parseObject(sData);
- String message = jsonObject.getString("Message");
- if(!"OK".equals(message)){
- System.err.println(message);
- return ResultUtil.error(message);
- }
+// String sData = aLiSendSms.sendSms(phone, templateCode, "{\"code\":\"" + authCode + "\"}");
+ SMSUtil.send(phone, "您的验证码：" + authCode + "，您正在进行身份验证，请勿泄露于他人！", "2431012312847");
+// JSONObject jsonObject = JSON.parseObject(sData);
+// String message = jsonObject.getString("Message");
+// if(!"OK".equals(message)){
+// System.err.println(message);
+// return ResultUtil.error(message);
+// }
System.out.println(sms);
return ResultUtil.success();
}
@@ -249,7 +250,7 @@
inviteMapper.insert(invite);
if (userType==1){
// 只有用户邀请用户会获得优惠券
- List<Map<String, Object>> query = userActivityInviteMapper.query(userInfo.getCompanyId());
+ List<Map<String, Object>> query = userActivityInviteMapper.query(1);
Date date = new Date();
for(Map<String, Object> map : query){
Double lavePrice = Double.valueOf(map.get("lavePrice").toString());
@@ -405,7 +406,7 @@
}
if(type == 1){//用户分享
UserInfo userInfo = userInfoMapper.selectById(uid);
- List<Map<String, Object>> query = userActivityInviteMapper.query(userInfo.getCompanyId());
+ List<Map<String, Object>> query = userActivityInviteMapper.query(1);
Date date = new Date();
for(Map<String, Object> map : query){
Double lavePrice = Double.valueOf(map.get("lavePrice").toString());
@@ -564,7 +565,7 @@
inviteMapper.insert(invite);
if (userType==1){
// 只有用户邀请用户会获得优惠券
- List<Map<String, Object>> query = userActivityInviteMapper.query(userInfo.getCompanyId());
+ List<Map<String, Object>> query = userActivityInviteMapper.query(1);
Date date = new Date();
for(Map<String, Object> map : query){
Double lavePrice = Double.valueOf(map.get("lavePrice").toString());
@@ -1174,7 +1175,7 @@
* @throws Exception
*/
public synchronized void addCoupon(Integer userId, Double money, Integer companyId, Integer paymentRecordId) throws Exception{
- List<Map<String, Object>> query = userActivityBalanceService.query(money, companyId);
+ List<Map<String, Object>> query = userActivityBalanceService.query(money, 1);
List<UserCouponRecord> list = new ArrayList<>();
for(Map<String, Object> map : query){
//添加通用优惠券
@@ -1355,7 +1356,7 @@
*/
private synchronized void addCoupon(UserInfo userInfo) throws Exception{
//添加优惠券
- List<Map<String, Object>> list = userActivityRegisteredService.query(userInfo.getCompanyId());
+ List<Map<String, Object>> list = userActivityRegisteredService.query(1);
int num = 0;
for(Map<String, Object> map : list){
if(null != map){
@@ -1403,7 +1404,7 @@
*/
private synchronized void addInviteCoupon(UserInfo userInfo) throws Exception{
//添加优惠券
- List<Map<String, Object>> list = userActivityInviteMapper.query(userInfo.getCompanyId());
+ List<Map<String, Object>> list = userActivityInviteMapper.query(1);
int num = 0;
for(Map<String, Object> map : list){
if(null != map){
--
Gitblit v1.7.1