会员管理代码

baqing-shop/src/main/java/com/ruoyi/web/modules/entry/service/impl/MerchantEntryApplyServiceImpl.java

@@ -39,7 +39,11 @@ import com.ruoyi.web.modules.merchant.dto.MerchantCreateDTO;
 import com.ruoyi.web.modules.merchant.mapper.BizMerchantMapper;
 import com.ruoyi.web.modules.merchant.service.IMerchantAccountBindService;
 import com.ruoyi.web.modules.merchant.support.BizCompleteEvaluator;
+import com.ruoyi.web.modules.merchant.vo.MerchantShopBriefVO;
 import com.ruoyi.web.modules.store.dto.ShopCreateDTO;
+import com.ruoyi.web.modules.store.domain.BizMerchantAccount;
+import com.ruoyi.web.modules.store.domain.BizShop;
+import com.ruoyi.web.modules.store.mapper.BizMerchantAccountMapper;
 import com.ruoyi.web.modules.store.mapper.BizShopMapper;
 import com.ruoyi.web.modules.store.service.IShopService;
 
@@ -57,6 +61,9 @@ public class MerchantEntryApplyServiceImpl implements IMerchantEntryApplyService
     @Autowired
     private BizShopMapper shopMapper;
 
+    @Autowired
+    private BizMerchantAccountMapper merchantAccountMapper;
+
     @Autowired
     private BizMemberMapper memberMapper;
 
@@ -255,7 +262,29 @@ public class MerchantEntryApplyServiceImpl implements IMerchantEntryApplyService
 
     private Map<String, Object> finalizeEntry(BizMerchantEntryApply apply, String operator)
     {
+        if (apply.getMerchantId() != null && apply.getShopId() != null)
+        {
+            return markApplyApproved(apply, apply.getMerchantId(), apply.getShopId(), operator, false);
+        }
+
         EntryApplySubmitDTO submitDto = buildSubmitFromApply(apply);
+
+        BizMerchant memberAdminMerchant = findMerchantByMemberAdmin(apply.getMemberId());
+        if (memberAdminMerchant != null)
+        {
+            log.info("会员已是商户管理员，复用商户并按申请创建店铺完成入驻，applyId={}，merchantId={}",
+                    apply.getApplyId(), memberAdminMerchant.getMerchantId());
+            return reconcileWithExistingMerchant(apply, memberAdminMerchant, submitDto, operator, true);
+        }
+
+        BizMerchant existingMerchant = findExistingMerchant(submitDto, apply.getMerchantType());
+        if (existingMerchant != null && canReconcileExistingMerchant(existingMerchant, apply.getMemberId()))
+        {
+            log.info("入驻申请关联已有商户建档，applyId={}，merchantId={}", apply.getApplyId(),
+                    existingMerchant.getMerchantId());
+            return reconcileWithExistingMerchant(apply, existingMerchant, submitDto, operator, false);
+        }
+
         assertUniqueOnSubmit(submitDto, apply.getMerchantType(), apply.getApplyId());
         EntryApplyFormValidator.validateMobileSubmit(submitDto);
 
@@ -291,22 +320,142 @@ public class MerchantEntryApplyServiceImpl implements IMerchantEntryApplyService
         shopFundService.seedContactBankAccountFromEntry(shopId, merchant.getContactName(),
                 merchant.getBankAccount(), operator);
 
+        return markApplyApproved(apply, merchant.getMerchantId(), shopId, operator, true);
+    }
+
+    private Map<String, Object> markApplyApproved(BizMerchantEntryApply apply, Long merchantId, Long shopId,
+            String operator, boolean notifyMember)
+    {
         BizMerchantEntryApply update = new BizMerchantEntryApply();
         update.setApplyId(apply.getApplyId());
         update.setApplyStatus(MerchantEntryApplyConstants.STATUS_APPROVED);
-        update.setMerchantId(merchant.getMerchantId());
+        update.setMerchantId(merchantId);
         update.setShopId(shopId);
         update.setUpdateBy(operator);
         applyMapper.updateAuditResult(update);
 
-        messageSupport.sendPass(apply.getMemberId(), apply.getApplyId(), apply.getApplyNo());
+        if (notifyMember)
+        {
+            messageSupport.sendPass(apply.getMemberId(), apply.getApplyId(), apply.getApplyNo());
+        }
 
         Map<String, Object> data = new HashMap<>();
-        data.put("merchantId", merchant.getMerchantId());
+        data.put("merchantId", merchantId);
         data.put("shopId", shopId);
         return data;
     }
 
+    private Map<String, Object> reconcileWithExistingMerchant(BizMerchantEntryApply apply, BizMerchant merchant,
+            EntryApplySubmitDTO submitDto, String operator, boolean createShopFromApply)
+    {
+        requireMember(apply.getMemberId());
+        EntryApplyFormValidator.validateMobileSubmit(submitDto);
+
+        BizMerchantAccount account = merchantAccountMapper.selectByMerchantId(merchant.getMerchantId());
+        if (account == null)
+        {
+            MerchantCreateDTO bindDto = EntryApplyFormMapper.toMerchantCreateDTO(merchant, apply.getMemberId());
+            accountBindService.bindAccountOnMerchantCreate(merchant.getMerchantId(), bindDto, operator);
+        }
+
+        Long shopId = resolveShopForReconcile(apply, merchant, submitDto, operator, createShopFromApply);
+        shopFundService.seedContactBankAccountFromEntry(shopId, merchant.getContactName(),
+                merchant.getBankAccount(), operator);
+
+        return markApplyApproved(apply, merchant.getMerchantId(), shopId, operator, true);
+    }
+
+    private Long resolveShopForReconcile(BizMerchantEntryApply apply, BizMerchant merchant,
+            EntryApplySubmitDTO submitDto, String operator, boolean createShopFromApply)
+    {
+        if (apply.getShopId() != null)
+        {
+            return apply.getShopId();
+        }
+        String shopName = submitDto.getShop().getShopName();
+        if (createShopFromApply)
+        {
+            Long matchedShopId = findShopIdByNameUnderMerchant(merchant.getMerchantId(), shopName);
+            if (matchedShopId != null)
+            {
+                return matchedShopId;
+            }
+            if (shopMapper.countByShopName(shopName, null) > 0)
+            {
+                throw new ServiceException("店铺名称已存在");
+            }
+            ShopCreateDTO shopDto = EntryApplyFormMapper.toShopCreateDTO(apply.getFormJson(), merchant.getMerchantId());
+            return shopService.createShop(shopDto, operator);
+        }
+
+        BizShop earliest = shopMapper.selectEarliestByMerchantId(merchant.getMerchantId());
+        if (earliest != null)
+        {
+            return earliest.getShopId();
+        }
+        if (shopMapper.countByShopName(shopName, null) > 0)
+        {
+            throw new ServiceException("店铺名称已存在");
+        }
+        ShopCreateDTO shopDto = EntryApplyFormMapper.toShopCreateDTO(apply.getFormJson(), merchant.getMerchantId());
+        return shopService.createShop(shopDto, operator);
+    }
+
+    private Long findShopIdByNameUnderMerchant(Long merchantId, String shopName)
+    {
+        if (StringUtils.isEmpty(shopName))
+        {
+            return null;
+        }
+        for (MerchantShopBriefVO shop : shopMapper.selectBriefByMerchantId(merchantId))
+        {
+            if (shopName.equals(shop.getShopName()))
+            {
+                return shop.getShopId();
+            }
+        }
+        return null;
+    }
+
+    private BizMerchant findMerchantByMemberAdmin(Long memberId)
+    {
+        if (memberId == null)
+        {
+            return null;
+        }
+        BizMerchantAccount account = merchantAccountMapper.selectMerchantAdminByUserId(memberId);
+        if (account == null || account.getMerchantId() == null)
+        {
+            return null;
+        }
+        return merchantMapper.selectById(account.getMerchantId());
+    }
+
+    private BizMerchant findExistingMerchant(EntryApplySubmitDTO dto, String merchantType)
+    {
+        if (MerchantConstants.TYPE_PERSON.equals(merchantType) && dto.getSubject() != null
+                && StringUtils.isNotEmpty(dto.getSubject().getIdCardNo()))
+        {
+            return merchantMapper.selectByIdCardNo(dto.getSubject().getIdCardNo());
+        }
+        if (MerchantConstants.TYPE_ENTERPRISE.equals(merchantType) && dto.getSubject() != null
+                && StringUtils.isNotEmpty(dto.getSubject().getCreditCode()))
+        {
+            return merchantMapper.selectByCreditCode(dto.getSubject().getCreditCode());
+        }
+        return null;
+    }
+
+    private boolean canReconcileExistingMerchant(BizMerchant merchant, Long memberId)
+    {
+        BizMerchantAccount account = merchantAccountMapper.selectByMerchantId(merchant.getMerchantId());
+        if (account == null)
+        {
+            return true;
+        }
+        return memberId != null && memberId.equals(account.getAccountId());
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void reject(EntryApplyRejectDTO dto, String operator)

baqing-shop/src/main/java/com/ruoyi/web/modules/merchant/mapper/BizMerchantMapper.java

@@ -19,6 +19,10 @@ public interface BizMerchantMapper
 
     int countByIdCardNo(@Param("idCardNo") String idCardNo, @Param("excludeId") Long excludeId);
 
+    BizMerchant selectByIdCardNo(@Param("idCardNo") String idCardNo);
+
+    BizMerchant selectByCreditCode(@Param("creditCode") String creditCode);
+
     int countByMerchantName(@Param("merchantName") String merchantName, @Param("excludeId") Long excludeId);
 
     int insert(BizMerchant merchant);

baqing-shop/src/main/java/com/ruoyi/web/modules/store/facade/impl/MerchantShopFacadeImpl.java

@@ -3,6 +3,7 @@ package com.ruoyi.web.modules.store.facade.impl;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.web.modules.merchant.facade.IMerchantShopFacade;
 import com.ruoyi.web.modules.merchant.mapper.BizMerchantMapper;
 import com.ruoyi.web.modules.merchant.vo.MerchantShopBriefVO;
@@ -29,18 +30,18 @@ public class MerchantShopFacadeImpl implements IMerchantShopFacade
     @Override
     public void incrementShopCount(Long merchantId)
     {
-        if (merchantId != null)
+        if (merchantId != null && merchantMapper.incrementShopCount(merchantId) <= 0)
         {
-            merchantMapper.incrementShopCount(merchantId);
+            throw new ServiceException("更新商户店铺数量失败");
         }
     }
 
     @Override
     public void decrementShopCount(Long merchantId)
     {
-        if (merchantId != null)
+        if (merchantId != null && merchantMapper.decrementShopCount(merchantId) <= 0)
         {
-            merchantMapper.decrementShopCount(merchantId);
+            throw new ServiceException("更新商户店铺数量失败");
         }
     }
 }

baqing-shop/src/main/java/com/ruoyi/web/modules/store/service/impl/ShopServiceImpl.java

@@ -140,7 +140,10 @@ public class ShopServiceImpl implements IShopService
         shop.setDelFlag(ShopConstants.DEL_NORMAL);
         shop.setCreateBy(operator);
         shopMapper.insert(shop);
-        merchantShopFacade.incrementShopCount(dto.getMerchantId());
+        if (merchantMapper.incrementShopCount(dto.getMerchantId()) <= 0)
+        {
+            throw new ServiceException("更新商户店铺数量失败");
+        }
         return shop.getShopId();
     }
 

baqing-shop/src/main/resources/mapper/merchant/BizMerchantMapper.xml

@@ -115,6 +115,18 @@
         <if test="excludeId != null">and merchant_id != #{excludeId}</if>
     </select>
 
+    <select id="selectByIdCardNo" resultMap="BizMerchantResult">
+        <include refid="selectVo"/>
+        where id_card_no = #{idCardNo} and del_flag = '0'
+        limit 1
+    </select>
+
+    <select id="selectByCreditCode" resultMap="BizMerchantResult">
+        <include refid="selectVo"/>
+        where credit_code = #{creditCode} and del_flag = '0'
+        limit 1
+    </select>
+
     <select id="countByMerchantName" resultType="int">
         select count(1) from biz_merchant
         where merchant_name = #{merchantName} and del_flag = '0'
@@ -215,12 +227,12 @@
     </update>
 
     <update id="incrementShopCount">
-        update biz_merchant set shop_count = shop_count + 1, update_time = sysdate()
+        update biz_merchant set shop_count = ifnull(shop_count, 0) + 1, update_time = sysdate()
         where merchant_id = #{merchantId} and del_flag = '0'
     </update>
 
     <update id="decrementShopCount">
-        update biz_merchant set shop_count = case when shop_count > 0 then shop_count - 1 else 0 end,
+        update biz_merchant set shop_count = case when ifnull(shop_count, 0) > 0 then shop_count - 1 else 0 end,
             update_time = sysdate()
         where merchant_id = #{merchantId} and del_flag = '0'
     </update>

baqing-shop/src/test/java/com/ruoyi/web/modules/entry/service/MerchantEntryApplyServiceImplTest.java

@@ -34,7 +34,10 @@ import com.ruoyi.web.modules.merchant.constant.MerchantConstants;
 import com.ruoyi.web.modules.merchant.domain.BizMerchant;
 import com.ruoyi.web.modules.merchant.mapper.BizMerchantMapper;
 import com.ruoyi.web.modules.merchant.service.IMerchantAccountBindService;
+import com.ruoyi.web.modules.store.mapper.BizMerchantAccountMapper;
 import com.ruoyi.web.modules.store.mapper.BizShopMapper;
+import com.ruoyi.web.modules.store.domain.BizMerchantAccount;
+import com.ruoyi.web.modules.store.domain.BizShop;
 import com.ruoyi.web.modules.store.service.IShopService;
 import com.ruoyi.web.modules.entry.support.MemberEntryMessageSupport;
 
@@ -53,6 +56,9 @@ class MerchantEntryApplyServiceImplTest
     @Mock
     private BizShopMapper shopMapper;
 
+    @Mock
+    private BizMerchantAccountMapper merchantAccountMapper;
+
     @Mock
     private BizMemberMapper memberMapper;
 
@@ -236,6 +242,88 @@ class MerchantEntryApplyServiceImplTest
                 eq("admin"));
     }
 
+    @Test
+    void completePublicity_reconcileExistingMerchantForSameMember()
+    {
+        EntryApplySubmitDTO dto = buildValidPersonDto();
+        String formJson = EntryApplyFormMapper.toFormJson(dto);
+
+        BizMerchantEntryApply apply = new BizMerchantEntryApply();
+        apply.setApplyId(2L);
+        apply.setApplyNo("EA20260101002");
+        apply.setApplyStatus(MerchantEntryApplyConstants.STATUS_PUBLICITY);
+        apply.setMerchantType(MerchantConstants.TYPE_PERSON);
+        apply.setMemberId(100L);
+        apply.setFormJson(formJson);
+        apply.setPublicityEndTime(new Date(System.currentTimeMillis() - 1000));
+
+        BizMerchant existing = new BizMerchant();
+        existing.setMerchantId(200L);
+        existing.setIdCardNo("110101199001011234");
+        existing.setContactName("张三");
+        existing.setBankAccount("6222020000000000");
+
+        BizMerchantAccount account = new BizMerchantAccount();
+        account.setMerchantId(200L);
+        account.setAccountId(100L);
+
+        when(applyMapper.selectById(2L)).thenReturn(apply);
+        when(memberMapper.selectById(100L)).thenReturn(member);
+        when(merchantAccountMapper.selectMerchantAdminByUserId(100L)).thenReturn(account);
+        when(merchantMapper.selectById(200L)).thenReturn(existing);
+        when(merchantAccountMapper.selectByMerchantId(200L)).thenReturn(account);
+        when(shopMapper.selectBriefByMerchantId(200L)).thenReturn(java.util.Collections.emptyList());
+        when(shopMapper.countByShopName(any(), eq(null))).thenReturn(0);
+        when(shopService.createShop(any(), eq("system"))).thenReturn(301L);
+
+        applyService.completePublicity(2L, "system");
+
+        verify(merchantMapper, never()).insert(any());
+        verify(shopService).createShop(any(), eq("system"));
+        verify(applyMapper).updateAuditResult(any());
+        verify(messageSupport).sendPass(eq(100L), eq(2L), eq("EA20260101002"));
+    }
+
+    @Test
+    void completePublicity_memberAdminCreatesShopDespiteDuplicateIdCard()
+    {
+        EntryApplySubmitDTO dto = buildValidPersonDto();
+        String formJson = EntryApplyFormMapper.toFormJson(dto);
+
+        BizMerchantEntryApply apply = new BizMerchantEntryApply();
+        apply.setApplyId(2L);
+        apply.setApplyNo("EA20260101002");
+        apply.setApplyStatus(MerchantEntryApplyConstants.STATUS_PUBLICITY);
+        apply.setMerchantType(MerchantConstants.TYPE_PERSON);
+        apply.setMemberId(100L);
+        apply.setFormJson(formJson);
+        apply.setPublicityEndTime(new Date(System.currentTimeMillis() - 1000));
+
+        BizMerchant adminMerchant = new BizMerchant();
+        adminMerchant.setMerchantId(200L);
+        adminMerchant.setContactName("张三");
+        adminMerchant.setBankAccount("6222020000000000");
+
+        BizMerchantAccount account = new BizMerchantAccount();
+        account.setMerchantId(200L);
+        account.setAccountId(100L);
+
+        when(applyMapper.selectById(2L)).thenReturn(apply);
+        when(memberMapper.selectById(100L)).thenReturn(member);
+        when(merchantAccountMapper.selectMerchantAdminByUserId(100L)).thenReturn(account);
+        when(merchantMapper.selectById(200L)).thenReturn(adminMerchant);
+        when(merchantAccountMapper.selectByMerchantId(200L)).thenReturn(account);
+        when(shopMapper.selectBriefByMerchantId(200L)).thenReturn(java.util.Collections.emptyList());
+        when(shopMapper.countByShopName(any(), eq(null))).thenReturn(0);
+        when(shopService.createShop(any(), eq("system"))).thenReturn(301L);
+
+        applyService.completePublicity(2L, "system");
+
+        verify(merchantMapper, never()).insert(any());
+        verify(merchantMapper, never()).countByIdCardNo(any(), any());
+        verify(shopService).createShop(any(), eq("system"));
+    }
+
     private EntryApplySubmitDTO buildValidPersonDto()
     {
         EntryApplySubmitDTO dto = new EntryApplySubmitDTO();

baqing-shop/src/test/java/com/ruoyi/web/modules/store/service/ShopServiceImplTest.java

@@ -86,13 +86,14 @@ class ShopServiceImplTest
             s.setShopId(10L);
             return 1;
         });
+        when(merchantMapper.incrementShopCount(1L)).thenReturn(1);
 
         Long shopId = shopService.createShop(dto, "admin");
 
         assertEquals(10L, shopId);
         verify(accountMapper, never()).insert(any());
         verify(shopMapper).insert(any(BizShop.class));
-        verify(merchantShopFacade).incrementShopCount(1L);
+        verify(merchantMapper).incrementShopCount(1L);
     }
 
     @Test
@@ -129,6 +130,7 @@ class ShopServiceImplTest
             assertEquals(ShopConstants.STATUS_OPEN, s.getShopStatus());
             return 1;
         });
+        when(merchantMapper.incrementShopCount(1L)).thenReturn(1);
 
         shopService.createShop(dto, "admin");
 

sql/biz_shop.sql

@@ -1,19 +1,17 @@
 -- =============================================================================
 -- 商户经营账号 biz_merchant_account
+-- 用途：商家端登录账号，一商户一商户管理员（shop_id=NULL）
 -- 创建时机：平台新增商户绑定时 / C端入驻公示完成后绑定申请会员/商户管理员添加员工账号时
 -- =============================================================================
 CREATE TABLE IF NOT EXISTS `biz_merchant_account` (
   `account_id` bigint(20) NOT NULL COMMENT '经营账号ID，与 sys_user.user_id 一致',
-  `merchant_id` bigint(20) NOT NULL COMMENT '所属商户ID（biz_merchant.merchant_id）；一商户一条（del_flag=0）',
+  `merchant_id` bigint(20) NOT NULL COMMENT '所属商户ID（biz_merchant.merchant_id）',
   `shop_id` bigint(20) DEFAULT NULL COMMENT '店铺ID；NULL=商户管理员',
   `del_flag` char(1) NOT NULL DEFAULT '0' COMMENT '删除标志：0存在 2逻辑删除（末店删除后一般仍保留）',
   `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
   `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
-  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
-  PRIMARY KEY (`account_id`),
-  KEY `idx_merchant_id` (`merchant_id`,`del_flag`)
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商户经营账号（商家端登录，一商户一套）';
 
 -- =============================================================================