create:商户工具类

2025-01-02 13:14:06 +08:00
1 parent fbab10ba0e
commit badada9b65
@@ -5,6 +5,7 @@ import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.feign.annotation.NoToken;
 import com.bsd.pjcloud.wallet.api.constant.WalletTypeCodeEnum;
 import com.bsd.pjcloud.wallet.api.dto.MchManageDto;
+import com.bsd.pjcloud.wallet.api.vo.MchManageVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -16,18 +17,18 @@ public interface RemoteMchService {

    @NoToken
    @GetMapping("/get-by-id")
-    R<MchManageDto> getById(@RequestParam Long id);
+    R<MchManageVo> getById(@RequestParam Long id);

    @NoToken
    @GetMapping("/get-by-ids")
-    R<List<MchManageDto>> getByIds(@RequestParam List<Long> ids);
+    R<List<MchManageVo>> getByIds(@RequestParam List<Long> ids);

    @NoToken
    @GetMapping("/get-by-dept-id")
-    R<MchManageDto> getByDeptId(@RequestParam Long deptId);
+    R<MchManageVo> getByDeptId(@RequestParam Long deptId);

    @NoToken
    @GetMapping("/get-first-mch")
-    R<MchManageDto> getFirstMch(@RequestParam List<Long> deptIds);
+    R<MchManageVo> getFirstMch(@RequestParam List<Long> deptIds);

 }
@@ -0,0 +1,27 @@
+package com.bsd.pjcloud.wallet.api.utils;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.bsd.pjcloud.admin.api.entity.SysUser;
+import com.bsd.pjcloud.admin.api.vo.base.BaseUserInterface;
+import com.bsd.pjcloud.common.core.util.CollectionUtils;
+import com.bsd.pjcloud.wallet.api.vo.MchManageVo;
+import com.bsd.pjcloud.wallet.api.vo.base.BaseMchInterface;
+import lombok.experimental.UtilityClass;
+
+import java.util.List;
+import java.util.Map;
+
+@UtilityClass
+public class MchDataUtil {
+
+    public <T extends BaseMchInterface> List<T> convertMchList(List<T> list, Map<Long, MchManageVo> map) {
+        return CollectionUtils.convertList(list, v -> convertMch(v, map.get(v.getMchId())));
+    }
+
+    public <T extends BaseMchInterface> T convertMch(T v, MchManageVo vo) {
+        if (ObjectUtil.isEmpty(vo)) return v;
+        v.setMchName(vo.getName());
+        return v;
+    }
+
+}
@@ -0,0 +1,19 @@
+package com.bsd.pjcloud.wallet.api.vo.base;
+
+public interface BaseMchInterface {
+
+    /**
+     * 商户id
+     */
+    Long getMchId();
+
+    void setMchId(Long dchId);
+
+    /**
+     * 商户名
+     */
+    String getMchName();
+
+    void setMchName(String dchName);
+
+}
@@ -47,32 +47,32 @@ public class MchManageController {

    @Inner
    @GetMapping("/get-by-id")
-    public R<MchManageDto> getById(@RequestParam Long id) {
+    public R<MchManageVo> getById(@RequestParam Long id) {
        MchManageEntity mchManage = mchManageService.getById(id);
        if (ObjectUtil.isEmpty(mchManage)) return R.failed("商户不存在");
-        return R.ok(BeanUtils.toBean(mchManage, MchManageDto.class));
+        return R.ok(BeanUtils.toBean(mchManage, MchManageVo.class));
    }

    @Inner
    @GetMapping("/get-by-ids")
-    public R<List<MchManageDto>> getByIds(@RequestParam List<Long> ids) {
-        Page<MchManageVo> page = mchManageService.pageJoin(new Page<>(), MchManageDto.builder().deptIds(ids).build());
-        if (ObjectUtil.isAllNotEmpty(page, page.getRecords())) return R.failed("商户不存在");
-        return R.ok(BeanUtils.toBean(page.getRecords(), MchManageDto.class));
+    public R<List<MchManageVo>> getByIds(@RequestParam List<Long> ids) {
+        List<MchManageVo> list = mchManageService.list(MchManageDto.builder().deptIds(ids).build());
+        if (ObjectUtil.isAllNotEmpty(list)) return R.failed("商户不存在");
+        return R.ok(list);
    }

    @Inner
    @GetMapping("/get-by-dept-id")
-    public R<MchManageDto> getByDeptId(@RequestParam Long deptId) {
-        MchManageDto mchManage = mchManageService.getByDeptId(deptId);
+    public R<MchManageVo> getByDeptId(@RequestParam Long deptId) {
+        MchManageVo mchManage = mchManageService.getByDeptId(deptId);
        if (ObjectUtil.isEmpty(mchManage)) return R.failed("商户不存在");
        return R.ok(mchManage);
    }

    @Inner
    @GetMapping("/get-first-mch")
-    public R<MchManageDto> getFirstMch(@RequestParam List<Long> deptIds) {
-        MchManageDto mchManage = mchManageService.getFirstMch(deptIds);
+    public R<MchManageVo> getFirstMch(@RequestParam List<Long> deptIds) {
+        MchManageVo mchManage = mchManageService.getFirstMch(deptIds);
        if (ObjectUtil.isEmpty(mchManage)) return R.failed("商户不存在");
        return R.ok(mchManage);
    }
@@ -1,5 +1,6 @@
 package com.bsd.pjcloud.wallet.mapper;

+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
 import com.bsd.pjcloud.wallet.api.dto.MchManageDto;
@@ -8,6 +9,8 @@ import com.bsd.pjcloud.wallet.api.vo.MchManageVo;
 import com.github.yulichang.query.MPJLambdaQueryWrapper;
 import org.apache.ibatis.annotations.Mapper;

+import java.util.List;
+
@Mapper
 public interface MchManageMapper extends PjcloudBaseMapper<MchManageEntity> {

@@ -15,7 +18,16 @@ public interface MchManageMapper extends PjcloudBaseMapper<MchManageEntity> {
    default Page<MchManageVo> pageJoin(Page page, MchManageDto dto) {
        MPJLambdaQueryWrapper<MchManageEntity> wrapper = new MPJLambdaQueryWrapper<MchManageEntity>()
                .selectAll(MchManageEntity.class)
-                .likeIfExists(MchManageEntity::getName, dto.getName());
+                .likeIfExists(MchManageEntity::getName, dto.getName())
+                .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), MchManageEntity::getDeptId, dto.getDeptIds());
        return selectJoinPage(page, MchManageVo.class, wrapper);
    }
+
+    default List<MchManageVo> list(MchManageDto dto) {
+        MPJLambdaQueryWrapper<MchManageEntity> wrapper = new MPJLambdaQueryWrapper<MchManageEntity>()
+                .selectAll(MchManageEntity.class)
+                .likeIfExists(MchManageEntity::getName, dto.getName())
+                .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), MchManageEntity::getDeptId, dto.getDeptIds());
+        return selectJoinList(MchManageVo.class, wrapper);
+    }
 }
@@ -19,7 +19,9 @@ public interface MchManageService extends IService<MchManageEntity> {

    Page<MchManageVo> pageJoin(Page page, MchManageDto dto);

-    MchManageDto getByDeptId(Long deptId);
+    List<MchManageVo> list(MchManageDto dto);

-    MchManageDto getFirstMch(List<Long> deptIds);
+    MchManageVo getByDeptId(Long deptId);
+
+    MchManageVo getFirstMch(List<Long> deptIds);
 }
@@ -130,21 +130,26 @@ public class MchManageServiceImpl extends ServiceImpl<MchManageMapper, MchManage
    }

    @Override
-    public MchManageDto getByDeptId(Long deptId) {
-        MchManageEntity mchManage = baseMapper.selectOne(new LambdaQueryWrapper<MchManageEntity>()
-                .eq(MchManageEntity::getDeptId, deptId)
-        );
-        return BeanUtils.toBean(mchManage, MchManageDto.class);
+    public List<MchManageVo> list(MchManageDto dto) {
+        return baseMapper.list(dto);
    }

    @Override
-    public MchManageDto getFirstMch(List<Long> deptIds) {
+    public MchManageVo getByDeptId(Long deptId) {
+        MchManageEntity mchManage = baseMapper.selectOne(new LambdaQueryWrapper<MchManageEntity>()
+                .eq(MchManageEntity::getDeptId, deptId)
+        );
+        return BeanUtils.toBean(mchManage, MchManageVo.class);
+    }
+
+    @Override
+    public MchManageVo getFirstMch(List<Long> deptIds) {
        List<MchManageEntity> merchantList = baseMapper.selectList(new LambdaQueryWrapper<MchManageEntity>());
        if (ObjectUtil.isEmpty(merchantList)) return null;
        for (Long id : deptIds) {
            for (MchManageEntity merchant : merchantList) {
                if (ObjectUtil.equals(merchant.getDeptId(), id)) {
-                    return BeanUtils.toBean(merchant, MchManageDto.class);
+                    return BeanUtils.toBean(merchant, MchManageVo.class);
                }
            }
        }