Просмотр исходного кода

新增门店审核校验不强制token改为取请求体userId

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
qmj 1 день назад
Родитель
Сommit
bdd70abce5

+ 4 - 6
ruoyi-admin/src/main/java/com/ruoyi/app/mendian/PosStoreController.java

@@ -256,14 +256,12 @@ public class PosStoreController extends BaseController {
 
     //添加门店
     @Anonymous
-    @Auth
     @PostMapping("/addmendian")
     @Transactional
-    public AjaxResult addmendian(@RequestHeader String token, @RequestBody PosStore posStore) {
-        if (posStore.getId() == null) {
-            Long userId = Long.valueOf(new JwtUtil().getusid(token));
-            userService.checkUserStatus(userId);
-            posStore.setUserId(userId);
+    public AjaxResult addmendian(@RequestBody PosStore posStore) {
+        // 新增时校验商家审核状态(未审核不能新增门市);不强制 token,身份取请求体 userId
+        if (posStore.getId() == null && posStore.getUserId() != null) {
+            userService.checkUserStatus(posStore.getUserId());
         }
         try {
             // 1. 先保存门店信息

+ 3 - 11
ruoyi-admin/src/test/java/com/ruoyi/app/mendian/PosStoreControllerTest.java

@@ -8,7 +8,6 @@ import com.ruoyi.framework.web.exception.GlobalExceptionHandler;
 import com.ruoyi.system.domain.InfoUser;
 import com.ruoyi.system.domain.PosStore;
 import com.ruoyi.system.service.IPosStoreService;
-import com.ruoyi.system.utils.JwtUtil;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -69,24 +68,22 @@ class PosStoreControllerTest {
                 .thenThrow(new ServiceException("账号状态未审核"));
 
         mockMvc.perform(post("/chanting/store/addmendian")
-                        .header("token", tokenFor(101L))
                         .contentType(APPLICATION_JSON)
-                        .content(objectMapper.writeValueAsString(newStore(999L))))
+                        .content(objectMapper.writeValueAsString(newStore(101L))))
                 .andExpect(jsonPath("$.code").value(500))
                 .andExpect(jsonPath("$.msg").value("账号状态未审核"));
     }
 
     @Test
-    void auditedMerchantCreatesStoreOwnedByTokenUser() throws Exception {
+    void auditedMerchantCreatesStoreOwnedByRequestBodyUser() throws Exception {
         when(userService.checkUserStatus(101L)).thenReturn(auditedMerchant(101L));
         PosStore saved = newStore(101L);
         saved.setId(9);
         when(posStoreService.getOne(any())).thenReturn(saved);
 
         mockMvc.perform(post("/chanting/store/addmendian")
-                        .header("token", tokenFor(101L))
                         .contentType(APPLICATION_JSON)
-                        .content(objectMapper.writeValueAsString(newStore(999L))))
+                        .content(objectMapper.writeValueAsString(newStore(101L))))
                 .andExpect(jsonPath("$.code").value(200));
 
         ArgumentCaptor<PosStore> captor = ArgumentCaptor.forClass(PosStore.class);
@@ -103,7 +100,6 @@ class PosStoreControllerTest {
         when(posStoreService.getById(9)).thenReturn(existing);
 
         mockMvc.perform(post("/chanting/store/addmendian")
-                        .header("token", tokenFor(101L))
                         .contentType(APPLICATION_JSON)
                         .content(objectMapper.writeValueAsString(existing)))
                 .andExpect(jsonPath("$.code").value(200));
@@ -123,8 +119,4 @@ class PosStoreControllerTest {
         user.setAuditStatus("1");
         return user;
     }
-
-    private static String tokenFor(Long userId) {
-        return JwtUtil.setToken(String.valueOf(userId), "merchant");
-    }
 }