会员管理代码

baqing-shop/src/main/java/com/ruoyi/web/modules/merchant/service/impl/MerchantServiceImpl.java

@@ -27,6 +27,8 @@ import com.ruoyi.web.modules.merchant.facade.IMerchantOrderFacade;
 import com.ruoyi.web.modules.merchant.facade.IMerchantShopFacade;
 import com.ruoyi.web.modules.merchant.mapper.BizMerchantMapper;
 import com.ruoyi.web.modules.merchant.service.IMerchantService;
+import com.ruoyi.web.modules.store.mapper.BizMerchantAccountMapper;
+import com.ruoyi.web.modules.store.vo.MerchantAccountUserVO;
 import com.ruoyi.web.modules.merchant.support.BizCompleteEvaluator;
 import com.ruoyi.web.modules.merchant.support.CertStatusTransition;
 import com.ruoyi.web.modules.merchant.support.MerchantDisplayUtils;
@@ -55,6 +57,9 @@ public class MerchantServiceImpl implements IMerchantService
     @Autowired
     private MerchantBindMapper merchantBindMapper;
 
+    @Autowired
+    private BizMerchantAccountMapper merchantAccountMapper;
+
     @Override
     public List<MerchantListVO> selectMerchantList(BizMerchant query)
     {
@@ -70,6 +75,7 @@ public class MerchantServiceImpl implements IMerchantService
             vo.setCanDelete(check.isCanDelete());
             rows.add(vo);
         }
+        fillAdminNames(rows);
         return rows;
     }
 
@@ -417,6 +423,38 @@ public class MerchantServiceImpl implements IMerchantService
         return m;
     }
 
+    private void fillAdminNames(List<MerchantListVO> rows)
+    {
+        if (rows == null || rows.isEmpty())
+        {
+            return;
+        }
+        List<Long> merchantIds = new ArrayList<>(rows.size());
+        for (MerchantListVO row : rows)
+        {
+            if (row.getMerchantId() != null)
+            {
+                merchantIds.add(row.getMerchantId());
+            }
+        }
+        if (merchantIds.isEmpty())
+        {
+            return;
+        }
+        Map<Long, String> adminNameByMerchantId = new HashMap<>();
+        for (MerchantAccountUserVO account : merchantAccountMapper.selectMerchantAdminNamesByMerchantIds(merchantIds))
+        {
+            if (account.getMerchantId() != null && StringUtils.isNotEmpty(account.getAdminName()))
+            {
+                adminNameByMerchantId.putIfAbsent(account.getMerchantId(), account.getAdminName());
+            }
+        }
+        for (MerchantListVO row : rows)
+        {
+            row.setAdminName(adminNameByMerchantId.get(row.getMerchantId()));
+        }
+    }
+
     private MerchantListVO toListVo(BizMerchant m)
     {
         MerchantListVO vo = new MerchantListVO();

baqing-shop/src/main/java/com/ruoyi/web/modules/merchant/vo/MerchantListVO.java

@@ -16,6 +16,9 @@ public class MerchantListVO
 
     private String merchantName;
 
+    /** 商户管理员姓名（sys_user.nick_name，shop_id 为空的首条经营账号） */
+    private String adminName;
+
     private String contactName;
 
     private String contactPhone;
@@ -73,6 +76,16 @@ public class MerchantListVO
         this.merchantName = merchantName;
     }
 
+    public String getAdminName()
+    {
+        return adminName;
+    }
+
+    public void setAdminName(String adminName)
+    {
+        this.adminName = adminName;
+    }
+
     public String getContactName()
     {
         return contactName;

baqing-shop/src/main/java/com/ruoyi/web/modules/store/mapper/BizMerchantAccountMapper.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.modules.store.mapper;
 
+import java.util.List;
 import org.apache.ibatis.annotations.Param;
 import com.ruoyi.web.modules.store.domain.BizMerchantAccount;
 import com.ruoyi.web.modules.store.vo.MerchantAccountUserVO;
@@ -18,6 +19,9 @@ public interface BizMerchantAccountMapper
 
     MerchantAccountUserVO selectMerchantAdminWithUser(@Param("merchantId") Long merchantId);
 
+    List<MerchantAccountUserVO> selectMerchantAdminNamesByMerchantIds(
+            @Param("merchantIds") List<Long> merchantIds);
+
     int countByAccountId(@Param("accountId") Long accountId);
 
     int insert(BizMerchantAccount account);

baqing-shop/src/main/resources/mapper/store/BizMerchantAccountMapper.xml

@@ -45,6 +45,16 @@
         where a.merchant_id = #{merchantId} and a.shop_id is null and a.del_flag = '0'
     </select>
 
+    <select id="selectMerchantAdminNamesByMerchantIds"
+            resultType="com.ruoyi.web.modules.store.vo.MerchantAccountUserVO">
+        select a.merchant_id as merchantId, u.nick_name as adminName
+        from biz_merchant_account a
+        inner join sys_user u on a.account_id = u.user_id and u.del_flag = '0'
+        where a.shop_id is null and a.del_flag = '0'
+          and a.merchant_id in
+        <foreach collection="merchantIds" item="id" open="(" separator="," close=")">#{id}</foreach>
+    </select>
+
     <select id="countByAccountId" resultType="int">
         select count(1) from biz_merchant_account
         where account_id = #{accountId} and del_flag = '0'

baqing-shop/src/test/java/com/ruoyi/web/modules/merchant/service/MerchantServiceImplTest.java

@@ -5,9 +5,12 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
 import com.ruoyi.web.modules.merchant.vo.OpenShopCheckVO;
@@ -26,6 +29,9 @@ import com.ruoyi.web.modules.merchant.facade.IMerchantOrderFacade;
 import com.ruoyi.web.modules.merchant.facade.IMerchantShopFacade;
 import com.ruoyi.web.modules.merchant.mapper.BizMerchantMapper;
 import com.ruoyi.web.modules.merchant.service.impl.MerchantServiceImpl;
+import com.ruoyi.web.modules.merchant.vo.MerchantListVO;
+import com.ruoyi.web.modules.store.mapper.BizMerchantAccountMapper;
+import com.ruoyi.web.modules.store.vo.MerchantAccountUserVO;
 
 @ExtendWith(MockitoExtension.class)
 class MerchantServiceImplTest
@@ -42,9 +48,35 @@ class MerchantServiceImplTest
     @Mock
     private IMerchantAccountBindService accountBindService;
 
+    @Mock
+    private BizMerchantAccountMapper merchantAccountMapper;
+
     @InjectMocks
     private MerchantServiceImpl merchantService;
 
+    @Test
+    void selectMerchantList_fillsAdminName()
+    {
+        BizMerchant merchant = new BizMerchant();
+        merchant.setMerchantId(1L);
+        merchant.setMerchantType(MerchantConstants.TYPE_PERSON);
+        merchant.setPersonName("张三");
+        merchant.setShopCount(0);
+        when(merchantMapper.selectList(any())).thenReturn(Collections.singletonList(merchant));
+        when(orderFacade.hasUnfinishedOrdersByMerchant(1L)).thenReturn(false);
+
+        MerchantAccountUserVO admin = new MerchantAccountUserVO();
+        admin.setMerchantId(1L);
+        admin.setAdminName("张管理员");
+        when(merchantAccountMapper.selectMerchantAdminNamesByMerchantIds(anyList()))
+                .thenReturn(Collections.singletonList(admin));
+
+        List<MerchantListVO> rows = merchantService.selectMerchantList(new BizMerchant());
+
+        assertEquals(1, rows.size());
+        assertEquals("张管理员", rows.get(0).getAdminName());
+    }
+
     @Test
     void insert_setsCertNormalAndBizComplete_whenBizFieldsComplete()
     {

ruoyi-ui/src/views/agri/org/merchant/index.vue

@@ -100,7 +100,7 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="证件号码" prop="idCardNo">
-                    <el-input v-model="form.idCardNo" maxlength="18" :disabled="!!form.merchantId" :placeholder="form.merchantId ? '选填' : '必填'" />
+                    <el-input v-model="form.idCardNo" maxlength="18" :disabled="!!form.merchantId" placeholder="选填" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -206,7 +206,7 @@
                 <el-col :span="12"><el-form-item label="企业名称" prop="companyName"><el-input v-model="form.companyName" maxlength="128" /></el-form-item></el-col>
                 <el-col :span="12">
                   <el-form-item label="统一社会信用代码" prop="creditCode">
-                    <el-input v-model="form.creditCode" maxlength="18" :disabled="!!form.merchantId" :placeholder="form.merchantId ? '选填' : '必填'" />
+                    <el-input v-model="form.creditCode" maxlength="18" :disabled="!!form.merchantId" placeholder="选填" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -247,8 +247,8 @@
             </template>
           </el-tab-pane>
 
-          <!-- 经营信息 -->
-          <el-tab-pane label="商户经营信息" name="biz">
+          <!-- 经营信息（仅编辑） -->
+          <el-tab-pane v-if="form.merchantId" label="商户经营信息" name="biz">
             <el-row :gutter="16">
               <el-col :span="12"><el-form-item label="商户名称" prop="merchantName"><el-input v-model="form.merchantName" maxlength="128" /></el-form-item></el-col>
               <el-col :span="12"><el-form-item label="客服电话" prop="servicePhone"><el-input v-model="form.servicePhone" maxlength="20" /></el-form-item></el-col>
@@ -372,7 +372,7 @@ export default {
     }
   },
   computed: {
-    /** 表单校验：新增须完整主体+经营信息；编辑经营信息在 biz 页签校验 */
+    /** 表单校验：新增个人仅姓名必填；新增企业仅法人姓名+企业名称必填；绑定仅新增时校验 */
     formRules() {
       const rules = {
         merchantType: [{ required: true, message: "请选择主体类型", trigger: "change" }]
@@ -380,41 +380,11 @@ export default {
       const isAdd = !this.form.merchantId
       if (this.form.merchantType === "1") {
         rules.personName = [{ required: true, message: "请输入姓名", trigger: "blur" }]
-        if (isAdd) {
-          rules.idCardNo = [{ required: true, message: "请输入证件号码", trigger: "blur" }]
-        }
       } else {
         rules.legalName = [{ required: true, message: "请输入法人姓名", trigger: "blur" }]
         rules.companyName = [{ required: true, message: "请输入企业名称", trigger: "blur" }]
-        if (isAdd) {
-          rules.creditCode = [{ required: true, message: "请输入统一社会信用代码", trigger: "blur" }]
-        }
       }
       if (isAdd) {
-        rules.merchantName = [{ required: true, message: "请输入商户名称", trigger: "blur" }]
-        rules.servicePhone = [{ required: true, message: "请输入客服电话", trigger: "blur" }]
-        rules.bizRegionCascader = [{
-          required: true,
-          validator: (rule, value, callback) => {
-            if (!value || value.length === 0) {
-              callback(new Error("请选择经营地区"))
-            } else {
-              callback()
-            }
-          },
-          trigger: "change"
-        }]
-        rules.bizDetailAddress = [{ required: true, message: "请输入经营详细地址", trigger: "blur" }]
-        rules.contactName = [{ required: true, message: "请输入联系人姓名", trigger: "blur" }]
-        rules.contactPhone = [{ required: true, message: "请输入联系人手机", trigger: "blur" }]
-        rules.contactEmail = [{ required: true, message: "请输入联系人邮箱", trigger: "blur" }]
-        rules.bankName = [{ required: true, message: "请输入开户银行", trigger: "blur" }]
-        rules.bankBranch = [{ required: true, message: "请输入支行名称", trigger: "blur" }]
-        rules.bankAccount = [{ required: true, message: "请输入银行账号", trigger: "blur" }]
-        if (this.form.merchantType === "2") {
-          rules.businessLicense = [{ required: true, message: "请上传营业执照电子版", trigger: "change" }]
-          rules.accountPermit = [{ required: true, message: "请上传开户许可证", trigger: "change" }]
-        }
         rules.bindType = [{ required: true, message: "请选择绑定类型", trigger: "change" }]
         if (this.form.bindType === "SYS_USER") {
           rules.bindUserId = [{ required: true, message: "请选择平台管理员", trigger: "change" }]
@@ -495,19 +465,6 @@ export default {
         bindType: "SYS_USER",
         bindUserId: undefined,
         bindMemberId: undefined,
-        merchantName: undefined,
-        servicePhone: undefined,
-        bizRegionCode: undefined,
-        bizRegionName: undefined,
-        bizDetailAddress: undefined,
-        contactName: undefined,
-        contactPhone: undefined,
-        contactEmail: undefined,
-        bankName: undefined,
-        bankBranch: undefined,
-        bankAccount: undefined,
-        businessLicense: undefined,
-        accountPermit: undefined,
         bizRegionCascader: []
       }
       this.activeTab = "subject"
@@ -664,10 +621,13 @@ export default {
         const payload = this.buildSubmitPayload()
         const submitFn = payload.merchantId ? updateMerchant : addMerchant
         submitFn(payload).then(response => {
-          let msg = response.msg || (payload.merchantId ? "修改成功" : "保存成功，已可开设店铺")
-          if (payload.merchantId && response.data && response.data.bizCompleteChanged) {
+          let msg = payload.merchantId ? "修改成功" : "新增成功"
+          if (response.data && response.data.bizCompleteChanged) {
             msg = "保存成功，已可开设店铺"
           }
+          if (!payload.merchantId) {
+            msg = "请尽快在编辑中完善商户经营信息后再开设店铺"
+          }
           if (response.data && response.data.warnExpired) {
             this.$modal.msgWarning("证件或营业期限已过期，请注意风险")
           }