Merge branch 'feature/0721-tenant'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -22,6 +22,7 @@ import com.yonge.cooleshow.biz.dal.wrapper.StatGroupWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.teacher.TeacherWrapper;
 import com.yonge.cooleshow.common.enums.ESettlementFrom;
 import com.yonge.cooleshow.common.enums.ETenantUnBindAuditStatus;
+import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RMap;
 import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;
@@ -365,7 +366,9 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             throw new BizException("插入用户信息失败");
         }
         //设置昵称
-        sysUser.setUsername("游客" + sysUser.getId());
+        if (StringUtils.isEmpty(sysUser.getUsername())) {
+            sysUser.setUsername("游客" + sysUser.getId());
+        }
         employeeDao.updateSysUser(sysUser);
         return sysUser;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserPaymentCoreServiceImpl.java

@@ -34,6 +34,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -110,6 +111,10 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
     @Autowired
     private StudentService studentService;
 
+
+    @Autowired
+    ApplicationContext applicationContext;
+
     @Autowired
     private VideoLessonGroupService videoLessonGroupService;
 
@@ -1107,7 +1112,7 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
                             try {
                                 log.info("scanPaymentTimeoutOrderRecord WAIT_PAY, userId={}, orderNo={}", item.getUserId(), item.getOrderNo());
                                 // 关闭待支付、超时订单
-                                SpringContextHolder.getBean(UserPaymentCoreService.class).cancelPayment(userInfo, item.getOrderNo());
+                                applicationContext.getBean(UserPaymentCoreService.class).cancelPayment(userInfo, item.getOrderNo());
                             } catch (Exception e) {
                                 log.error("scanPaymentTimeoutOrderRecord WAIT_PAY, userId={}, orderNo={}", item.getUserId(), item.getOrderNo(), e);
                             }

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantUnbindHistoryMapper.xml

@@ -23,6 +23,11 @@
         SELECT
         <include refid="baseColumns" />
         FROM tenant_unbind_history t
+        <where>
+            <if test="param.userId != null">
+                AND t.user_id_ = #{param.userId}
+            </if>
+        </where>
         order by id_ desc
     </select>