新增多城市支持逻辑，完善店铺管理功能并新增商家管理相关接口

shaofan
1 parent 33eee1ba
Showing 7 changed files with 197 additions and 32 deletions
src/main/java/com/diligrp/rider/controller/AdminMerchantController.java
src/main/java/com/diligrp/rider/dto/AdminRiderAddDTO.java
src/main/java/com/diligrp/rider/service/MerchantService.java
src/main/java/com/diligrp/rider/service/impl/AdminRiderServiceImpl.java
src/main/java/com/diligrp/rider/service/impl/MenuBootstrapServiceImpl.java
src/main/java/com/diligrp/rider/service/impl/MerchantServiceImpl.java
src/main/resources/data-init.sql
+package com.diligrp.rider.controller;
+
+import com.diligrp.rider.common.exception.BizException;
+import com.diligrp.rider.common.result.Result;
+import com.diligrp.rider.dto.MerchantStoreDTO;
+import com.diligrp.rider.entity.MerchantStore;
+import com.diligrp.rider.service.MerchantService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/admin/merchant")
+@RequiredArgsConstructor
+public class AdminMerchantController {
+
+    private final MerchantService merchantService;
+
+    @GetMapping("/store/list")
+    public Result<List<MerchantStore>> storeList(@RequestParam(required = false) Long cityId,
+                                                 @RequestParam(required = false) String keyword,
+                                                 @RequestParam(defaultValue = "1") int page,
+                                                 HttpServletRequest request) {
+        return Result.success(merchantService.storeList(resolveQueryCityId(request, cityId), keyword, page));
+    }
+
+    @PostMapping("/store/add")
+    public Result<Long> addStore(@Valid @RequestBody MerchantStoreDTO dto, HttpServletRequest request) {
+        return Result.success(merchantService.addStore(dto, resolveScopedCityId(request)));
+    }
+
+    @PutMapping("/store/edit")
+    public Result<Void> editStore(@Valid @RequestBody MerchantStoreDTO dto, HttpServletRequest request) {
+        merchantService.editStore(dto, resolveScopedCityId(request));
+        return Result.success();
+    }
+
+    @GetMapping("/store/detail")
+    public Result<MerchantStore> storeDetail(@RequestParam Long storeId, HttpServletRequest request) {
+        return Result.success(merchantService.getStore(storeId, resolveScopedCityId(request)));
+    }
+
+    @PostMapping("/store/setOperatingState")
+    public Result<Void> setOperatingState(@RequestParam Long storeId,
+                                          @RequestParam int state,
+                                          HttpServletRequest request) {
+        merchantService.setOperatingState(storeId, state, resolveScopedCityId(request));
+        return Result.success();
+    }
+
+    @PostMapping("/store/setAutoOrder")
+    public Result<Void> setAutoOrder(@RequestParam Long storeId,
+                                     @RequestParam int auto,
+                                     HttpServletRequest request) {
+        merchantService.setAutoOrder(storeId, auto);
+        return Result.success();
+    }
+
+    @PostMapping("/store/updateFeeConfig")
+    public Result<Void> updateFeeConfig(@RequestParam Long storeId,
+                                        @RequestParam(defaultValue = "0") BigDecimal freeShipping,
+                                        @RequestParam(defaultValue = "0") BigDecimal upToSend,
+                                        HttpServletRequest request) {
+        merchantService.updateFeeConfig(storeId, freeShipping, upToSend, resolveScopedCityId(request));
+        return Result.success();
+    }
+
+    @DeleteMapping("/store/del")
+    public Result<Void> delStore(@RequestParam Long storeId, HttpServletRequest request) {
+        merchantService.delStore(storeId, resolveScopedCityId(request));
+        return Result.success();
+    }
+
+    private Long resolveScopedCityId(HttpServletRequest request) {
+        if (!"substation".equals(request.getAttribute("role"))) {
+            return null;
+        }
+        Long cityId = (Long) request.getAttribute("cityId");
+        if (cityId == null || cityId < 1) {
+            throw new BizException("当前账号未绑定有效城市");
+        }
+        return cityId;
+    }
+
+    private Long resolveQueryCityId(HttpServletRequest request, Long queryCityId) {
+        Long scopedCityId = resolveScopedCityId(request);
+        return scopedCityId != null ? scopedCityId : queryCityId;
+    }
+}
@@ -14,5 +14,7 @@ public class AdminRiderAddDTO {
     @NotBlank(message = "密码不能为空")
     private String password;
+    private String idNo;
+
     private Long cityId;
 }
@@ -3,32 +3,24 @@ package com.diligrp.rider.service;
 import com.diligrp.rider.dto.MerchantStoreDTO;
 import com.diligrp.rider.entity.MerchantStore;
+import java.math.BigDecimal;
 import java.util.List;
 public interface MerchantService {
-    // ---- 店铺管理 ----
-    /** 新增店铺（平台后台直接新建，无需审核） */
     Long addStore(MerchantStoreDTO dto);
-    /** 编辑店铺 */
+    Long addStore(MerchantStoreDTO dto, Long scopedCityId);
     void editStore(MerchantStoreDTO dto);
-    /** 店铺列表 */
+    void editStore(MerchantStoreDTO dto, Long scopedCityId);
     List<MerchantStore> storeList(Long cityId, String keyword, int page);
-    /** 获取店铺详情 */
     MerchantStore getStore(Long storeId);
-    /** 设置营业/打烊 */
+    MerchantStore getStore(Long storeId, Long scopedCityId);
     void setOperatingState(Long storeId, int state);
-    /** 设置自动接单 */
+    void setOperatingState(Long storeId, int state, Long scopedCityId);
     void setAutoOrder(Long storeId, int auto);
-    /** 更新免运费和起送金额 */
-    void updateFeeConfig(Long storeId, java.math.BigDecimal freeShipping, java.math.BigDecimal upToSend);
-    /** 删除店铺 */
+    void updateFeeConfig(Long storeId, BigDecimal freeShipping, BigDecimal upToSend);
+    void updateFeeConfig(Long storeId, BigDecimal freeShipping, BigDecimal upToSend, Long scopedCityId);
     void delStore(Long storeId);
-    /**
-     * 外部系统同步门店（新增或更新，以 appKey+outStoreId 为唯一键）
-     */
+    void delStore(Long storeId, Long scopedCityId);
     MerchantStore syncStore(String appKey, MerchantStoreDTO dto);
-    /**
-     * 根据 appKey + outStoreId 查询门店
-     */
     MerchantStore getByOutStoreId(String appKey, String outStoreId);
 }
@@ -57,6 +57,7 @@ public class AdminRiderServiceImpl implements AdminRiderService {
         Rider rider = new Rider();
         rider.setUserNickname(dto.getUserNickname());
         rider.setMobile(dto.getMobile());
+        rider.setIdNo(dto.getIdNo());
         rider.setUserPass(encryptPass(dto.getPassword()));
         rider.setCityId(cityId);
         rider.setUserStatus(1);
@@ -61,9 +61,9 @@ public class MenuBootstrapServiceImpl implements MenuBootstrapService {
         defaults.add(menu("city.manage", "租户管理", "MENU", "/city", "GlobalOutlined", 0L, MenuScopeEnum.PLATFORM, 20));
         defaults.add(menu("substation.manage", "分站管理", "MENU", "/substation", "ApartmentOutlined", 0L, MenuScopeEnum.PLATFORM, 30));
         defaults.add(menu("substation.user", "分站账号", "MENU", "/substation/user", "TeamOutlined", 0L, MenuScopeEnum.SUBSTATION, 31));
-        defaults.add(menu("merchant.root", "商家管理", "DIR", "", "ShopOutlined", 0L, MenuScopeEnum.PLATFORM, 40));
-        defaults.add(menu("merchant.enter", "入驻申请", "MENU", "/merchant/enter", "", 0L, MenuScopeEnum.PLATFORM, 41));
-        defaults.add(menu("merchant.store", "店铺管理", "MENU", "/merchant/store", "", 0L, MenuScopeEnum.PLATFORM, 42));
+        defaults.add(menu("merchant.root", "商家管理", "DIR", "", "ShopOutlined", 0L, MenuScopeEnum.BOTH, 40));
+        defaults.add(menu("merchant.enter", "入驻申请", "MENU", "/merchant/enter", "", 0L, MenuScopeEnum.BOTH, 41));
+        defaults.add(menu("merchant.store", "店铺管理", "MENU", "/merchant/store", "", 0L, MenuScopeEnum.BOTH, 42));
         defaults.add(menu("rider.list", "骑手管理", "MENU", "/rider", "UserOutlined", 0L, MenuScopeEnum.BOTH, 50));
         defaults.add(menu("rider.level", "骑手等级", "MENU", "/rider/level", "TrophyOutlined", 0L, MenuScopeEnum.BOTH, 55));
         defaults.add(menu("rider.evaluate", "骑手评价", "MENU", "/rider/evaluate", "StarOutlined", 0L, MenuScopeEnum.BOTH, 60));
@@ -30,8 +30,15 @@ public class MerchantServiceImpl implements MerchantService {
     @Override
     @Transactional
     public Long addStore(MerchantStoreDTO dto) {
-        var city = cityService.getById(dto.getCityId());
-        if (city == null) throw new BizException("城市不存在");
+        return addStore(dto, null);
+    }
+
+    @Override
+    @Transactional
+    public Long addStore(MerchantStoreDTO dto, Long scopedCityId) {
+        Long effectiveCityId = resolveCityId(dto.getCityId(), scopedCityId);
+        dto.setCityId(effectiveCityId);
+        ensureCityExists(effectiveCityId);
         MerchantStore store = toEntity(dto);
         store.setAddTime(System.currentTimeMillis() / 1000);
@@ -56,8 +63,18 @@ public class MerchantServiceImpl implements MerchantService {
     @Override
     public void editStore(MerchantStoreDTO dto) {
-        MerchantStore existing = storeMapper.selectById(dto.getId());
-        if (existing == null) throw new BizException("店铺不存在");
+        editStore(dto, null);
+    }
+
+    @Override
+    public void editStore(MerchantStoreDTO dto, Long scopedCityId) {
+        MerchantStore existing = requireStore(dto.getId(), scopedCityId);
+        Long effectiveCityId = resolveCityId(dto.getCityId(), scopedCityId);
+        if (scopedCityId != null && !scopedCityId.equals(existing.getCityId())) {
+            throw new BizException("无权操作其他租户的店铺");
+        }
+        dto.setCityId(effectiveCityId);
+        ensureCityExists(effectiveCityId);
         MerchantStore store = toEntity(dto);
         store.setId(dto.getId());
         storeMapper.updateById(store);
@@ -71,42 +88,67 @@ public class MerchantServiceImpl implements MerchantService {
                 .orderByDesc(MerchantStore::getId);
         if (cityId != null && cityId > 0) wrapper.eq(MerchantStore::getCityId, cityId);
         if (keyword != null && !keyword.isBlank()) wrapper.like(MerchantStore::getName, keyword);
-        int offset = (page - 1) * PAGE_SIZE;
+        int currentPage = Math.max(page, 1);
+        int offset = (currentPage - 1) * PAGE_SIZE;
         wrapper.last("LIMIT " + offset + "," + PAGE_SIZE);
         return storeMapper.selectList(wrapper);
     }
     @Override
     public MerchantStore getStore(Long storeId) {
-        return storeMapper.selectById(storeId);
+        return getStore(storeId, null);
+    }
+
+    @Override
+    public MerchantStore getStore(Long storeId, Long scopedCityId) {
+        return requireStore(storeId, scopedCityId);
     }
     @Override
     public void setOperatingState(Long storeId, int state) {
+        setOperatingState(storeId, state, null);
+    }
+
+    @Override
+    public void setOperatingState(Long storeId, int state, Long scopedCityId) {
+        MerchantStore store = requireStore(storeId, scopedCityId);
         storeMapper.update(null, new LambdaUpdateWrapper<MerchantStore>()
-                .eq(MerchantStore::getId, storeId)
+                .eq(MerchantStore::getId, store.getId())
                 .set(MerchantStore::getOperatingState, state));
     }
     @Override
     public void setAutoOrder(Long storeId, int auto) {
+        MerchantStore store = requireStore(storeId, null);
         storeMapper.update(null, new LambdaUpdateWrapper<MerchantStore>()
-                .eq(MerchantStore::getId, storeId)
+                .eq(MerchantStore::getId, store.getId())
                 .set(MerchantStore::getAutomaticOrder, auto));
     }
     @Override
     public void updateFeeConfig(Long storeId, BigDecimal freeShipping, BigDecimal upToSend) {
+        updateFeeConfig(storeId, freeShipping, upToSend, null);
+    }
+
+    @Override
+    public void updateFeeConfig(Long storeId, BigDecimal freeShipping, BigDecimal upToSend, Long scopedCityId) {
+        MerchantStore store = requireStore(storeId, scopedCityId);
         storeMapper.update(null, new LambdaUpdateWrapper<MerchantStore>()
-                .eq(MerchantStore::getId, storeId)
+                .eq(MerchantStore::getId, store.getId())
                 .set(MerchantStore::getFreeShipping, freeShipping)
                 .set(MerchantStore::getUpToSend, upToSend));
     }
     @Override
     public void delStore(Long storeId) {
+        delStore(storeId, null);
+    }
+
+    @Override
+    public void delStore(Long storeId, Long scopedCityId) {
+        MerchantStore store = requireStore(storeId, scopedCityId);
         storeMapper.update(null, new LambdaUpdateWrapper<MerchantStore>()
-                .eq(MerchantStore::getId, storeId)
+                .eq(MerchantStore::getId, store.getId())
                 .set(MerchantStore::getIsDel, 1));
     }
@@ -115,6 +157,7 @@ public class MerchantServiceImpl implements MerchantService {
     public MerchantStore syncStore(String appKey, MerchantStoreDTO dto) {
         if (appKey == null || appKey.isBlank()) throw new BizException("AppKey不能为空");
         if (dto.getOutStoreId() == null || dto.getOutStoreId().isBlank()) throw new BizException("外部门店编号不能为空");
+        ensureCityExists(dto.getCityId());
         long now = System.currentTimeMillis() / 1000;
         MerchantStore existing = getByOutStoreId(appKey, dto.getOutStoreId());
@@ -144,6 +187,40 @@ public class MerchantServiceImpl implements MerchantService {
                 .last("LIMIT 1"));
     }
+    private void ensureCityExists(Long cityId) {
+        if (cityId == null || cityId < 1) {
+            throw new BizException("城市不能为空");
+        }
+        var city = cityService.getById(cityId);
+        if (city == null) {
+            throw new BizException("城市不存在");
+        }
+    }
+
+    private Long resolveCityId(Long dtoCityId, Long scopedCityId) {
+        if (scopedCityId != null) {
+            return scopedCityId;
+        }
+        if (dtoCityId == null || dtoCityId < 1) {
+            throw new BizException("城市不能为空");
+        }
+        return dtoCityId;
+    }
+
+    private MerchantStore requireStore(Long storeId, Long scopedCityId) {
+        MerchantStore store = storeMapper.selectOne(new LambdaQueryWrapper<MerchantStore>()
+                .eq(MerchantStore::getId, storeId)
+                .eq(MerchantStore::getIsDel, 0)
+                .last("LIMIT 1"));
+        if (store == null) {
+            throw new BizException("店铺不存在");
+        }
+        if (scopedCityId != null && !scopedCityId.equals(store.getCityId())) {
+            throw new BizException("无权操作其他租户的店铺");
+        }
+        return store;
+    }
+
     private MerchantStore toEntity(MerchantStoreDTO dto) {
         MerchantStore store = new MerchantStore();
         store.setName(dto.getName());
@@ -72,9 +72,9 @@ INSERT INTO `sys_menu` (`code`, `name`, `type`, `path`, `icon`, `parent_id`, `me
 ('dashboard', '工作台', 'MENU', '/dashboard', 'HomeOutlined', 0, 'BOTH', 10, 1, 1, UNIX_TIMESTAMP()),
 ('city.manage', '租户管理', 'MENU', '/city', 'GlobalOutlined', 0, 'PLATFORM', 20, 1, 1, UNIX_TIMESTAMP()),
 ('substation.manage', '分站管理', 'MENU', '/substation', 'ApartmentOutlined', 0, 'PLATFORM', 30, 1, 1, UNIX_TIMESTAMP()),
-('merchant.root', '商家管理', 'DIR', '', 'ShopOutlined', 0, 'PLATFORM', 40, 1, 1, UNIX_TIMESTAMP()),
-('merchant.enter', '入驻申请', 'MENU', '/merchant/enter', '', 4, 'PLATFORM', 41, 1, 1, UNIX_TIMESTAMP()),
-('merchant.store', '店铺管理', 'MENU', '/merchant/store', '', 4, 'PLATFORM', 42, 1, 1, UNIX_TIMESTAMP()),
+('merchant.root', '商家管理', 'DIR', '', 'ShopOutlined', 0, 'BOTH', 40, 1, 1, UNIX_TIMESTAMP()),
+('merchant.enter', '入驻申请', 'MENU', '/merchant/enter', '', 4, 'BOTH', 41, 1, 1, UNIX_TIMESTAMP()),
+('merchant.store', '店铺管理', 'MENU', '/merchant/store', '', 4, 'BOTH', 42, 1, 1, UNIX_TIMESTAMP()),
 ('rider.list', '骑手管理', 'MENU', '/rider', 'UserOutlined', 0, 'BOTH', 50, 1, 1, UNIX_TIMESTAMP()),
 ('rider.evaluate', '骑手评价', 'MENU', '/rider/evaluate', 'StarOutlined', 0, 'BOTH', 60, 1, 1, UNIX_TIMESTAMP()),
 ('order.root', '订单管理', 'DIR', '', 'UnorderedListOutlined', 0, 'BOTH', 70, 1, 1, UNIX_TIMESTAMP()),