From 2116b5b5802c0de0f126f85cf2ac56a732639e82 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 02 Jul 2025 16:39:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/system/service/impl/MerchantServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/system/service/impl/MerchantServiceImpl.java b/oying-system/src/main/java/com/oying/modules/system/service/impl/MerchantServiceImpl.java
index abf98cf..f8e0219 100644
--- a/oying-system/src/main/java/com/oying/modules/system/service/impl/MerchantServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/system/service/impl/MerchantServiceImpl.java
@@ -1,8 +1,11 @@
package com.oying.modules.system.service.impl;
import com.oying.modules.system.domain.Merchant;
+import com.oying.modules.system.domain.UserMerchant;
import com.oying.modules.system.mapper.MerchantMapper;
+import com.oying.modules.system.service.UserMerchantService;
import com.oying.utils.FileUtil;
+import com.oying.utils.enums.MerchantRole;
import lombok.RequiredArgsConstructor;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -29,6 +32,7 @@
public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> implements MerchantService {
private final MerchantMapper merchantMapper;
+ private final UserMerchantService userMerchantService;
@Override
public PageResult<Merchant> queryAll(MerchantsQueryCriteria criteria, Page<Object> page){
@@ -44,6 +48,11 @@
@Transactional(rollbackFor = Exception.class)
public void create(Merchant resources) {
merchantMapper.insert(resources);
+ UserMerchant userMerchant = new UserMerchant();
+ userMerchant.setMerchantId(resources.getMerchantId());
+ userMerchant.setUserId(resources.getUserId());
+ userMerchant.setRoleType(MerchantRole.OWNER.getRole());
+ userMerchantService.create(userMerchant);
}
@Override
--
Gitblit v1.9.3