fengji 添加模板

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

@@ -25,6 +25,7 @@ import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.WrapperUtil;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.im.ImFeignService;
 import com.ym.mec.im.entity.GroupMember;
 import com.ym.mec.im.entity.GroupModel;
@@ -138,7 +139,8 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		//删除当前用户角色
 		employeeDao.delEmployeeRole(employee.getId());
 		//新增用户角色
-		employeeDao.batchAddEmployeeRole(employee.getId(),employee.getRoleIds(), sysUser.getTeacherId());
+		Integer tenantId = TenantContextHolder.getTenantId();
+		employeeDao.batchAddEmployeeRole(employee.getId(),employee.getRoleIds(), tenantId);
 		teacherDao.updateUser(employee);
 		imGroupDao.updateNickname(employee.getUserId(), employee.getRealName());
 		imGroupDao.updateUserFriendNickname(employee.getUserId(), employee.getRealName());

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

@@ -277,7 +277,7 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
         CompletableFuture.runAsync(() -> {
             //检查5次
             Boolean ret = false;
-            for (int i = 0; i <= 15; i++) {
+            for (int i = 0; i <= 100; i++) { // 检查5分钟
                 try {
                     ret = cloudTeacherOrderService.payCheck(record);
                     if (ret) break;
@@ -305,7 +305,7 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
         //异步
         CompletableFuture.runAsync(() -> {
             //检查5次
-            for (int i = 0; i <= 15; i++) {
+            for (int i = 0; i <= 100; i++) { // 检查5分钟
                 try {
                     Boolean ret = tenantOrderRecordService.rechargeCheck(record);
                     if (ret) break;

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

@@ -253,7 +253,7 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
         if (!bucket.trySet(1, 3L, TimeUnit.SECONDS)) {
             return false;
         }
-        log.info("checkRechargeCheck  checkTenantOrder>>>>>");
+        log.info("checkRechargeCheck  rechargeCheck>>>>>");
         checkTransOrderState(record);
         if (record.getOrderState() == 1) {
             baseMapper.updateById(record);
@@ -265,7 +265,6 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
                 e.printStackTrace();
                 return false;
             }
-            // 发送短信
         }
         bucket.delete();
         return false;

mec-biz/src/main/resources/config/mybatis/TenantPaymentOrderMapper.xml

@@ -35,6 +35,7 @@
 	
 	<sql id="queryPaymentOrder">
         <where>
+			su.tenant_id_ = #{tenantId}
             <if test="organId != null">
                 AND FIND_IN_SET(tpo.organ_id_,#{organId})
             </if>

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/CommEmailPlugin.java

@@ -98,7 +98,7 @@ public class CommEmailPlugin implements MessageSenderPlugin, InitializingBean {
 		try {
 			email.setFrom(from, fromName);
 			email.setSubject(subject);
-			email.setMsg(content);
+			email.setContent(content, "text/html");
 			email.addTo(receiver);
 			email.send();
 			return true;