From 70d7bd95e4fbd606e9b1f29a02ccc999c581dc87 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 19 八月 2025 13:55:05 +0800
Subject: [PATCH] 8.18

---
 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java |   56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 49 insertions(+), 7 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 84759d7..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();
     }
@@ -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());
@@ -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());
@@ -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")));
                         }
@@ -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());
@@ -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