Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-api-cloud

pjcloud-wallet/pjcloud-wallet-biz/pom.xml

@@ -69,6 +69,11 @@
             <artifactId>pjcloud-wallet-api</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.bsd</groupId>
+            <artifactId>pjcloud-hardware-api</artifactId>
+            <version>5.7.0</version>
+        </dependency>
         <!--必备: log 依赖-->
         <dependency>
             <groupId>com.bsd</groupId>
@@ -77,13 +82,13 @@
         <!--选配: mybatis 依赖 -->
         <dependency>
             <groupId>com.baomidou</groupId>
-                        <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
-                    </dependency>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+        </dependency>
         <!--选配： druid 连接池 -->
         <dependency>
             <groupId>com.alibaba</groupId>
-                        <artifactId>druid-spring-boot-3-starter</artifactId>
-                    </dependency>
+            <artifactId>druid-spring-boot-3-starter</artifactId>
+        </dependency>
         <!--选配: mysql 数据库驱动 -->
         <dependency>
             <groupId>com.mysql</groupId>
@@ -119,7 +124,7 @@
                     <plugin>
                         <groupId>org.springframework.boot</groupId>
                         <artifactId>spring-boot-maven-plugin</artifactId>
-                                                <executions>
+                        <executions>
                             <execution>
                                 <goals>
                                     <goal>repackage</goal>
@@ -129,7 +134,7 @@
                                 </configuration>
                             </execution>
                         </executions>
-                                            </plugin>
+                    </plugin>
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java

@@ -1,11 +1,15 @@
 package com.bsd.pjcloud.wallet.mapper;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.common.core.util.BeanUtils;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
 import com.bsd.pjcloud.wallet.api.dto.MchManageDto;
 import com.bsd.pjcloud.wallet.api.entity.MchManageEntity;
 import com.bsd.pjcloud.wallet.api.vo.MchManageVo;
+import com.bsd.pjcloud.wallet.api.vo.WalletTransactionVo;
 import com.github.yulichang.query.MPJLambdaQueryWrapper;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
@@ -25,6 +29,13 @@ public interface MchManageMapper extends PjcloudBaseMapper<MchManageEntity> {
         return selectJoinPage(page, MchManageVo.class, wrapper);
     }
 
+    default MchManageVo join(Long id) {
+        MPJLambdaQueryWrapper<MchManageEntity> wrapper = new MPJLambdaQueryWrapper<MchManageEntity>()
+                .selectAll(MchManageEntity.class)
+                .eq(MchManageEntity::getId, id);
+        return selectJoinOne(MchManageVo.class, wrapper);
+    }
+
     default List<MchManageVo> list(MchManageDto dto) {
         MPJLambdaQueryWrapper<MchManageEntity> wrapper = new MPJLambdaQueryWrapper<MchManageEntity>()
                 .selectAll(MchManageEntity.class)
@@ -34,10 +45,21 @@ public interface MchManageMapper extends PjcloudBaseMapper<MchManageEntity> {
         return selectJoinList(MchManageVo.class, wrapper);
     }
 
-    default MchManageVo join(Long id) {
-        MPJLambdaQueryWrapper<MchManageEntity> wrapper = new MPJLambdaQueryWrapper<MchManageEntity>()
-                .selectAll(MchManageEntity.class)
-                .eq(MchManageEntity::getId, id);
-        return selectJoinOne(MchManageVo.class, wrapper);
+    default Page<MchManageVo> scopePageList(Page page, MchManageDto dto) {
+        LambdaQueryWrapper<MchManageEntity> wrapper = new LambdaQueryWrapper<MchManageEntity>()
+                .like(ObjectUtil.isNotEmpty(dto.getName()), MchManageEntity::getName, dto.getName())
+                .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), MchManageEntity::getDeptId, dto.getDeptIds())
+                .in(ObjectUtil.isNotEmpty(dto.getIds()), MchManageEntity::getId, dto.getIds());
+        Page list = selectPageByScope(page, wrapper, DataScope.of());
+        list.setRecords(BeanUtils.toBean(list.getRecords(), MchManageVo.class));
+        return list;
+    }
+
+    default List<MchManageEntity> scopeList(MchManageDto dto) {
+        LambdaQueryWrapper<MchManageEntity> wrapper = new LambdaQueryWrapper<MchManageEntity>()
+                .like(ObjectUtil.isNotEmpty(dto.getName()), MchManageEntity::getName, dto.getName())
+                .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), MchManageEntity::getDeptId, dto.getDeptIds())
+                .in(ObjectUtil.isNotEmpty(dto.getIds()), MchManageEntity::getId, dto.getIds());
+        return selectListByScope(wrapper, DataScope.of());
     }
 }

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java

@@ -117,7 +117,7 @@ public class MchManageServiceImpl extends ServiceImpl<MchManageMapper, MchManage
 
     @Override
     public Page<MchManageVo> pageJoin(Page page, MchManageDto dto) {
-        Page<MchManageVo> list = baseMapper.pageJoin(page, dto);
+        Page<MchManageVo> list = baseMapper.scopePageList(page, dto);
         if (ObjectUtil.isNotEmpty(list.getRecords())) {
             // 部门
             List<Long> deptIds = list.getRecords().stream().map(MchManageVo::getDeptId).distinct().toList();