feat: 商户查询修改

2025-03-26 15:31:45 +08:00
1 parent 63c6d1ed2b
commit 40277ae7fb
@@ -7,6 +7,7 @@ import com.bsd.pjcloud.admin.api.feign.RemoteUserService;
 import com.bsd.pjcloud.canteen.dto.UserPageDTO;
 import com.bsd.pjcloud.canteen.mapper.OrderingPreferencesMapper;
 import com.bsd.pjcloud.canteen.service.OrderingPreferencesService;
+import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.security.service.PjcloudUser;
@@ -42,7 +43,7 @@ public class OrderingPreferencesServiceImpl  implements OrderingPreferencesServi
        PjcloudUser user = SecurityUtils.getUser();

        Long deptId = user.getDeptId();
-        MchManageVo manageVo =  remoteMchService.getByDeptId(deptId).getData();
+        MchManageVo manageVo =  remoteMchService.getByDeptId(deptId, MerchantTypeEnum.SELF_SUPERMARKET).getData();
        HardOrderPreferencesDto hardOrderPreferencesDto = new HardOrderPreferencesDto();
        //管理员
        if (user.getId() != 1L){
@@ -7,8 +7,8 @@ import lombok.RequiredArgsConstructor;
@Getter
 public enum MerchantTypeEnum {
    CANTEEN("1", "食堂"),
-    SELF_SUPERMARKET("2", "自营超市"),
    SUPERMARKET("3", "合作超市"),
+    SELF_SUPERMARKET("2", "自营超市"),
    ;

    /**
@@ -6,6 +6,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum;
 import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
@@ -92,7 +93,7 @@ public class SmSpuController {
    public R save(@RequestBody SmSpuEntity smSpu) {
        Long deptId = SecurityUtils.getUser().getDeptId();
        //查询商户，设置商户id
-        R<MchManageVo> byDeptId = remoteMchService.getByDeptId(deptId);
+        R<MchManageVo> byDeptId = remoteMchService.getByDeptId(deptId, MerchantTypeEnum.SELF_SUPERMARKET);
        MchManageVo data = byDeptId.getData();
        if (Objects.isNull(data) || !data.getTypes().contains("2")){
            return R.failed("当前用户未绑定超市商户");
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum;
 import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
@@ -511,7 +512,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEnt
    @Transactional(rollbackFor = Exception.class)
    public R importErpSpu(List<SmErpSpuImportDto> smErpSpuImportDtos, BindingResult bindingResult) {
        Long deptId = SecurityUtils.getUser().getDeptId();
-        R<MchManageVo> mchManageVoR = remoteMchService.getByDeptId(deptId);
+        R<MchManageVo> mchManageVoR = remoteMchService.getByDeptId(deptId, MerchantTypeEnum.SELF_SUPERMARKET);
        if (null==mchManageVoR.getData()){
            return R.failed("当前用户未绑定超市商户");
        }
@@ -1,6 +1,7 @@
 package com.bsd.pjcloud.wallet.api.feign;

 import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
+import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.feign.annotation.NoToken;
 import com.bsd.pjcloud.wallet.api.vo.MchManageVo;
@@ -23,7 +24,7 @@ public interface RemoteMchService {

    @NoToken
    @GetMapping("/mch-manage/get-by-dept-id")
-    R<MchManageVo> getByDeptId(@RequestParam Long deptId);
+    R<MchManageVo> getByDeptId(@RequestParam Long deptId, @RequestParam(required = false) MerchantTypeEnum type);

    @NoToken
    @GetMapping("/mch-manage/get-by-dept-ids")
@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum;
 import com.bsd.pjcloud.common.core.constant.enums.YesNoEnum;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
@@ -60,8 +61,8 @@ public class MchManageController {

    @Inner
    @GetMapping("/get-by-dept-id")
-    public R<MchManageVo> getByDeptId(@RequestParam Long deptId) {
-        MchManageVo mchManage = mchManageService.getByDeptId(deptId);
+    public R<List<MchManageVo>> getByDeptId(@RequestParam Long deptId, @RequestParam(required = false) MerchantTypeEnum type) {
+        List<MchManageVo> mchManage = mchManageService.getByDeptId(deptId, type);
        if (ObjectUtil.isEmpty(mchManage)) return R.failed("商户不存在");
        return R.ok(mchManage);
    }
@@ -2,6 +2,7 @@ package com.bsd.pjcloud.wallet.service;

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum;
 import com.bsd.pjcloud.wallet.api.dto.MchManageDto;
 import com.bsd.pjcloud.wallet.api.entity.MchManageEntity;
 import com.bsd.pjcloud.wallet.api.vo.MchManageVo;
@@ -25,7 +26,7 @@ public interface MchManageService extends IService<MchManageEntity> {

    List<MchManageVo> list(MchManageDto dto);

-    MchManageVo getByDeptId(Long deptId);
+    List<MchManageVo> getByDeptId(Long deptId, MerchantTypeEnum type);

    MchManageVo getFirstMch(List<Long> deptIds);

@@ -14,6 +14,7 @@ import com.bsd.pjcloud.admin.api.feign.RemoteFileService;
 import com.bsd.pjcloud.admin.api.feign.RemoteUserService;
 import com.bsd.pjcloud.admin.api.utils.DataUtil;
 import com.bsd.pjcloud.common.core.constant.CacheConstants;
+import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum;
 import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.core.util.CollectionUtils;
 import com.bsd.pjcloud.common.core.util.QRCodeImageGenerator;
@@ -191,9 +192,10 @@ public class MchManageServiceImpl extends ServiceImpl<MchManageMapper, MchManage
    }

    @Override
-    public MchManageVo getByDeptId(Long deptId) {
-        MchManageEntity mchManage = baseMapper.selectOne(new LambdaQueryWrapper<MchManageEntity>()
+    public List<MchManageVo> getByDeptId(Long deptId, MerchantTypeEnum type) {
+        List<MchManageEntity> mchManage = baseMapper.selectList(new LambdaQueryWrapper<MchManageEntity>()
                .eq(MchManageEntity::getDeptId, deptId)
+                .eq(ObjectUtil.isNotEmpty(type), MchManageEntity::getTypes, type)
        );
        return BeanUtils.toBean(mchManage, MchManageVo.class);
    }