| 
					
				 | 
			
			
				@@ -1,8 +1,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 package com.gree.mall.manager.logic.policy; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import cn.hutool.core.bean.BeanUtil; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import cn.hutool.core.date.DateTime; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import cn.hutool.core.date.DateUtil; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import cn.hutool.json.JSONUtil; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.baomidou.mybatisplus.core.metadata.IPage; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.baomidou.mybatisplus.core.toolkit.IdWorker; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -10,9 +10,7 @@ import com.gree.mall.manager.bean.ExcelData; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.gree.mall.manager.bean.admin.AdminUserCom; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.gree.mall.manager.bean.policy.*; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.gree.mall.manager.commonmapper.PolicyCMapper; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import com.gree.mall.manager.constant.Constant; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.gree.mall.manager.enums.*; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import com.gree.mall.manager.exception.RemoteServiceException; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.gree.mall.manager.logic.common.CommonLogic; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.gree.mall.manager.plus.entity.*; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.gree.mall.manager.plus.service.*; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -22,7 +20,6 @@ import com.gree.mall.manager.utils.email.EmailUtilsNew; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.gree.mall.manager.utils.excel.ExcelUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.gree.mall.manager.zfire.bean.ZfireParamBean; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.gree.mall.manager.zfire.util.FieldUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import lombok.SneakyThrows; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import lombok.extern.log4j.Log4j; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.apache.http.client.utils.DateUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.beans.factory.annotation.Autowired; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -36,7 +33,6 @@ import javax.mail.MessagingException; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import javax.mail.Session; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.io.File; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.io.IOException; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import java.math.BigDecimal; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.time.Instant; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.time.LocalDateTime; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.time.LocalTime; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -933,7 +929,7 @@ public class AgreementLogic { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Mailbox mailbox = mailboxService.getById("1"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         for (WebsitUser websitUser : websitUsers) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            log.info("task5 " + websitUser.getUserId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             User user = userService.getById(websitUser.getUserId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             String remark = ""; 
			 |