From 53562814add61acfdc02d6b25dae6324f6fd5f92 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java
index 06d0d5f..fbd5c46 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java
@@ -12,6 +12,7 @@
import com.stylefeng.guns.core.shiro.ShiroUser;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.SysCouponRecord;
import com.stylefeng.guns.modular.system.model.TUser;
import com.stylefeng.guns.modular.system.model.UserCouponRecord;
@@ -220,6 +221,12 @@
}else{
JSONArray userId = JSON.parseArray(sysCouponActivity.getSendUserId());
for(int j=0;j<userId.size();j++){
+ // 获取邮箱
+ TUser tUser = userService.selectById(userId.getJSONObject(j).getInteger("userId"));
+ String email = tUser.getEmail();
+ if(ToolUtil.isNotEmpty(email)){
+ // TODO 发送邮件
+ }
userCouponRecord.setUserId(userId.getJSONObject(j).getInteger("userId"));
for (int i=0;i<sysCouponActivity.getNumber();i++){
userCouponRecord.insert();
--
Gitblit v1.7.1