Merge branch 'feature/message_1008' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/TenantActivationCodeController.java

@@ -66,9 +66,9 @@ import java.net.URLEncoder;
 import java.text.MessageFormat;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 
 @Slf4j
@@ -192,6 +192,9 @@ public class TenantActivationCodeController extends BaseController {
         if (!update) {
             throw new BizException("激活码已经激活");
         }
+        Map<Long, String> receivers = new HashMap<>(1);
+        receivers.put(activationCode.getActivationUserId(), activationCode.getActivationUserId().toString());
+        tenantActivationCodeService.sendCancelActivationCodeMessage(receivers,tenantInfo.getName());
         return succeed();
     }