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

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/TenantInfoService.java
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoServiceImpl.java

mec-biz/src/main/java/com/ym/mec/biz/service/AppRedemptionCodeService.java

@@ -14,7 +14,7 @@ import java.util.List;
  */
 public interface AppRedemptionCodeService extends IService<AppRedemptionCode> {
 
-    List<AppRedemptionCode> importRedemptionCode(MultipartFile file) throws Exception;
+    String importRedemptionCode(MultipartFile file) throws Exception;
 
     AppRedemptionCode allocation(Integer userId);
 

mec-biz/src/main/java/com/ym/mec/biz/service/TenantInfoService.java

@@ -38,6 +38,8 @@ public interface TenantInfoService extends IService<TenantInfo> {
 
     TenantProductSumm queryTenantInfoProductSumm(Integer id);
 
+    Boolean testEmail();
+
     /**
     * @description: 保存tenantId
      * @param request

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

@@ -56,7 +56,7 @@ public class AppRedemptionCodeServiceImpl extends ServiceImpl<RedemptionCodeDao,
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public List<AppRedemptionCode> importRedemptionCode(MultipartFile file) throws Exception {
+    public String importRedemptionCode(MultipartFile file) throws Exception {
         Map<String, List<Map<String, Object>>> sheetsListMap = POIUtil.importExcel(
                 new ByteArrayInputStream(file.getBytes()), 0, file.getOriginalFilename());
 
@@ -96,11 +96,12 @@ public class AppRedemptionCodeServiceImpl extends ServiceImpl<RedemptionCodeDao,
         try {
             redemptionCodeDao.insertBatch(redemptionCodesList);
         } catch (DuplicateKeyException dupKeyEx) {
-            throw new BizException("数据重复:" + dupKeyEx.getCause(), dupKeyEx);
+            logger.error("数据导入重复: " + dupKeyEx.getCause());
+            return "数据重复:" + dupKeyEx;
         } catch (Exception ex) {
             throw new BizException("导入数据出错:" + ex, ex);
         }
-        return redemptionCodesList;
+        return "成功导入 " + redemptionCodesList.size() + "条";
     }
 
     @Override

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

@@ -267,6 +267,7 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
         });
     }
 
+    // 检查云教室
     private void delayCheckCloudTeacherOrder(TenantOrderRecord record) {
         RBucket<Object> bucket = redissonClient.getBucket("delay_check_tenant");
         if (!bucket.trySet(1, 15L, TimeUnit.SECONDS)) {
@@ -276,7 +277,7 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
         CompletableFuture.runAsync(() -> {
             //检查5次
             Boolean ret = false;
-            for (int i = 0; i <= 5; i++) {
+            for (int i = 0; i <= 15; i++) {
                 try {
                     ret = cloudTeacherOrderService.payCheck(record);
                     if (ret) break;
@@ -294,6 +295,7 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
         });
     }
 
+    // 检查机构充值
     private void delayCheckTenantRecharge(TenantOrderRecord record) {
         RBucket<Object> bucket = redissonClient.getBucket("delay_check_tenant");
         if (!bucket.trySet(1, 15L, TimeUnit.SECONDS)) {
@@ -303,7 +305,7 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
         //异步
         CompletableFuture.runAsync(() -> {
             //检查5次
-            for (int i = 0; i <= 5; i++) {
+            for (int i = 0; i <= 15; i++) {
                 try {
                     Boolean ret = tenantOrderRecordService.rechargeCheck(record);
                     if (ret) break;

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

@@ -25,6 +25,7 @@ import com.ym.mec.common.page.PageUtil;
 import com.ym.mec.common.page.WrapperUtil;
 import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.common.tenant.TenantContextHolder;
+import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.thirdparty.yqpay.DateUtils;
 import com.ym.mec.thirdparty.yqpay.Msg;
 import com.ym.mec.util.date.DateUtil;
@@ -85,6 +86,8 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
     private TenantAssetsInfoService assetsInfoService;
     @Autowired
     private StudentService studentService;
+    @Autowired
+    private SysMessageService sysMessageService;
 
     /**
      * 新增机构
@@ -667,6 +670,12 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         return tps;
     }
 
+
+    @Override
+    public Boolean testEmail() {
+        // sysMessageService.batchSendMessage(MessageSener.);
+        return false;
+    }
     @Override
     public void saveTenantContextHolder(HttpServletRequest request) {
         String tenantId = request.getHeader("tenantId");

mec-web/src/main/java/com/ym/mec/web/controller/ImportController.java

@@ -68,13 +68,15 @@ public class ImportController extends BaseController {
     @ApiOperation(value = "导入兑换码分配模板")
     @PostMapping(value = "importRedemptionCode")
     @PreAuthorize("@pcs.hasPermissions('import/importRedemptionCode')")
-    public HttpResponseResult<List<AppRedemptionCode>> importRedemptionCode(@RequestParam("file") MultipartFile file) throws Exception {
+    public HttpResponseResult<String> importRedemptionCode(@RequestParam("file") MultipartFile file) throws Exception {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        List<AppRedemptionCode> ret = appRedemptionCodeService.importRedemptionCode(file);
-        return succeed(ret);
+        String msg = appRedemptionCodeService.importRedemptionCode(file);
+        HttpResponseResult response = succeed(null);
+        response.setMsg(msg);
+        return response;
     }
 
     @ApiOperation(value = "导入财务管理订单")

mec-web/src/main/java/com/ym/mec/web/controller/TenantInfoController.java

@@ -133,4 +133,10 @@ public class TenantInfoController extends BaseController {
     ) throws Exception {
         return succeed(tenantInfoService.rechargeCheck(orderNo));
     }
+
+    @ApiOperation(value = "测试邮件")
+    @GetMapping("/testEmail")
+    public HttpResponseResult<Boolean> testEmail() throws Exception {
+        return succeed(tenantInfoService.testEmail());
+    }
 }