From f6fd3607f046744e86f391956d91d0f009bb3adb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 18 八月 2025 22:50:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java | 68 +++++++++++++++++++++++++++------
1 files changed, 55 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..2f3578e 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
@@ -42,6 +42,7 @@
import java.io.*;
import java.math.BigDecimal;
import java.security.SecureRandom;
+import java.time.LocalDateTime;
import java.util.*;
@@ -160,13 +161,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 +251,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());
@@ -277,6 +279,14 @@
userCouponRecordService.insert(userCouponRecord);
//修改剩余可发放总金额
lavePrice -= Double.valueOf(String.valueOf(map.get("money")));
+
+ // 订阅通知
+ UserInfo userInfo1 = userInfoMapper.selectById(uid);
+ if(userInfo1.getOpenId()!=null){
+ // 推送订阅消息
+ WxMaSubscribeMessageUtil.push(userInfo1.getAppletsOpenId(),map.get("name").toString(),userCouponRecord.getMoney());
+ }
+
}
UserActivityInvite uai = userActivityInviteMapper.selectById(Integer.valueOf(map.get("id").toString()));
uai.setLavePrice(new BigDecimal(lavePrice).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -405,7 +415,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());
@@ -433,6 +443,15 @@
userCouponRecordService.insert(userCouponRecord);
//修改剩余可发放总金额
lavePrice -= Double.valueOf(String.valueOf(map.get("money")));
+
+ // 订阅通知
+ UserInfo userInfo1 = userInfoMapper.selectById(uid);
+ if(userInfo1.getOpenId()!=null){
+ // 推送订阅消息
+ WxMaSubscribeMessageUtil.push(userInfo1.getAppletsOpenId(),map.get("name").toString(),userCouponRecord.getMoney());
+ }
+
+
}
UserActivityInvite uai = userActivityInviteMapper.selectById(Integer.valueOf(map.get("id").toString()));
uai.setLavePrice(new BigDecimal(lavePrice).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -564,7 +583,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());
@@ -590,6 +609,16 @@
userCouponRecord.setCompanyId(userInfo.getCompanyId());
userCouponRecord.setUserId(uid);
userCouponRecordService.insert(userCouponRecord);
+
+
+ // 订阅通知
+ UserInfo userInfo1 = userInfoMapper.selectById(uid);
+ if(userInfo1.getOpenId()!=null){
+ // 推送订阅消息
+ WxMaSubscribeMessageUtil.push(userInfo1.getAppletsOpenId(),map.get("name").toString(),userCouponRecord.getMoney());
+ }
+
+
//修改剩余可发放总金额
lavePrice -= Double.valueOf(String.valueOf(map.get("money")));
}
@@ -1174,7 +1203,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 +1384,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){
@@ -1387,6 +1416,13 @@
//修改剩余可发放总金额
lavePrice -= Double.valueOf(String.valueOf(map.get("money")));
num++;
+
+
+ // 订阅通知
+ if(userInfo.getOpenId()!=null){
+ // 推送订阅消息
+ WxMaSubscribeMessageUtil.push(userInfo.getAppletsOpenId(),map.get("name").toString(),userCouponRecord.getMoney());
+ }
}
UserActivityRegistered uar = userActivityRegisteredService.selectById(Integer.valueOf(map.get("id").toString()));
uar.setLavePrice(new BigDecimal(lavePrice).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -1403,7 +1439,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){
@@ -1435,6 +1471,12 @@
//修改剩余可发放总金额
lavePrice -= Double.valueOf(String.valueOf(map.get("money")));
num++;
+
+ // 订阅通知
+ if(userInfo.getOpenId()!=null){
+ // 推送订阅消息
+ WxMaSubscribeMessageUtil.push(userInfo.getAppletsOpenId(),map.get("name").toString(),userCouponRecord.getMoney());
+ }
}
UserActivityRegistered uar = userActivityRegisteredService.selectById(Integer.valueOf(map.get("id").toString()));
uar.setLavePrice(new BigDecimal(lavePrice).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
--
Gitblit v1.7.1