Merge remote-tracking branch 'origin/saas' into saas

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/MessageTypeEnum.java

@@ -198,6 +198,7 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
 
     APP_REDEMPTION_CODE("APP_REDEMPTION_CODE", "兑换码分配量预警"),
     CLOUD_TEACHER_ORDER_SUCCESS("CLOUD_TEACHER_ORDER_SUCCESS", "云教练激活成功"),
+    TEST_EMAIL_FIRST("TEST_EMAIL_FIRST", "测试邮件")
     ;
 
     MessageTypeEnum(String code, String msg) {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/AppRedemptionCodeServiceImpl.java

@@ -97,7 +97,7 @@ public class AppRedemptionCodeServiceImpl extends ServiceImpl<RedemptionCodeDao,
             redemptionCodeDao.insertBatch(redemptionCodesList);
         } catch (DuplicateKeyException dupKeyEx) {
             logger.error("数据导入重复: " + dupKeyEx.getCause());
-            return "数据重复:" + dupKeyEx;
+            throw new BizException("数据重复:" + dupKeyEx.getCause());
         } catch (Exception ex) {
             throw new BizException("导入数据出错:" + ex, ex);
         }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/OrderPayOpsServiceImpl.java

@@ -309,7 +309,7 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
                 try {
                     Boolean ret = tenantOrderRecordService.rechargeCheck(record);
                     if (ret) break;
-                    Thread.sleep(3000);//每3秒触发一次
+                    Thread.sleep(3000); // 每3秒触发一次
                     log.info("executePayment 重试 >>>>>  start {}", i);
                 } catch (InterruptedException e) {
                     return;

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoServiceImpl.java

@@ -673,7 +673,11 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
 
     @Override
     public Boolean testEmail() {
-        // sysMessageService.batchSendMessage(MessageSener.);
+        Map<Integer, String> receivers = new HashMap<>();
+        receivers.put(1, "yanite1234@sina.com");
+        receivers.put(2, "yanite2016@sina.com");
+        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.EMAIL, MessageTypeEnum.TEST_EMAIL_FIRST, receivers, null, 0, null, "SYSTEM", null, null, null, null);
+
         return false;
     }
     @Override