瀏覽代碼

feature: 消费服务
1.消费明细表多租户

luoyb 1 年之前
父節點
當前提交
53d1827264

+ 1 - 1
ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/business/BaseBusiness.java

@@ -275,7 +275,6 @@ public class BaseBusiness {
 
         XfConsumeDetailBo consumeDetailBo = new XfConsumeDetailBo();
         BeanUtil.copyProperties(bo, consumeDetailBo);
-        consumeDetailBo.setTenantId(bo.getTenantId());
         consumeDetailBo.setConsumeId(recordId);
         // 设置消费账户信息
         BeanUtil.copyProperties(userAccountVo, consumeDetailBo);
@@ -308,6 +307,7 @@ public class BaseBusiness {
         consumeDetailBo.setCreateTime(DateUtil.date());
         consumeDetailBo.setUpdateTime(DateUtil.date());
 
+        consumeDetailBo.setTenantId(bo.getTenantId());
         log.info("tttt-{}", JSONUtil.toJsonStr(consumeDetailBo));
 
         return consumeDetailService.createConsumeDetailRecord(consumeDetailBo);

+ 2 - 2
ruoyi-server/ruoyi-server-sync/src/main/java/org/dromara/server/sync/service/impl/UserAccountServiceImpl.java

@@ -99,7 +99,7 @@ public class UserAccountServiceImpl implements IUserAccountService {
      */
     @Override
     public Boolean deleteById(String userId) {
-        UserAccountVo vo = baseMapper.selectVoById(userId);
+        UserAccountVo vo = TenantHelper.ignore(() -> baseMapper.selectVoById(userId));
         vo.setDelFlag(DefaultConstants.DELETED);
         kafkaNormalProducer.sendKafkaMessage(KafkaTopicConstants.SYNC_DATA_TOPIC, EventTypeConstants.ACCOUNT, EventSenderEnum.BACKSTAGE.code(), vo);
         return TenantHelper.ignore(() -> baseMapper.update(null, new LambdaUpdateWrapper<UserAccount>()
@@ -111,7 +111,7 @@ public class UserAccountServiceImpl implements IUserAccountService {
 
     @Override
     public Boolean deleteById(Long userId, Long operationId) {
-        UserAccountVo vo = baseMapper.selectVoById(userId);
+        UserAccountVo vo = TenantHelper.ignore(() -> baseMapper.selectVoById(userId));
         vo.setDelFlag(DefaultConstants.DELETED);
         vo.setUpdateBy(operationId);
         vo.setUpdateTime(DateUtil.date());