feat:钱包模块倒序

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTypeController.java

@@ -48,6 +48,7 @@ public class WalletTypeController {
     @PreAuthorize("@pms.hasPermission('wallet_walletType_view')" )
     public R getWalletTypePage(@ParameterObject Page page, @ParameterObject WalletTypeEntity walletType) {
         LambdaQueryWrapper<WalletTypeEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.orderByDesc(WalletTypeEntity::getCreateTime);
         return R.ok(walletTypeService.page(page, wrapper));
     }
 

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargePackageController.java

@@ -50,6 +50,7 @@ public class WalletRechargePackageController {
     @PreAuthorize("@pms.hasPermission('wallet_walletRechargePackage_view')")
     public R getWalletRechargePackagePage(@ParameterObject Page page, @ParameterObject WalletRechargePackageEntity walletRechargePackage) {
         LambdaQueryWrapper<WalletRechargePackageEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.orderByDesc(WalletRechargePackageEntity::getCreateTime);
         return R.ok(walletRechargePackageService.page(page, wrapper));
     }
 

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

@@ -24,7 +24,8 @@ public interface MchManageMapper extends PjcloudBaseMapper<MchManageEntity> {
                 .selectAll(MchManageEntity.class)
                 .likeIfExists(MchManageEntity::getName, dto.getName())
                 .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), MchManageEntity::getDeptId, dto.getDeptIds())
-                .apply(ObjectUtil.isNotEmpty(dto.getType()), "FIND_IN_SET({0}, types)", dto.getType());
+                .apply(ObjectUtil.isNotEmpty(dto.getType()), "FIND_IN_SET({0}, types)", dto.getType())
+                .orderByDesc(MchManageEntity::getCreateTime);
         return selectJoinPage(page, MchManageVo.class, wrapper);
     }
 
@@ -40,7 +41,8 @@ public interface MchManageMapper extends PjcloudBaseMapper<MchManageEntity> {
                 .selectAll(MchManageEntity.class)
                 .likeIfExists(MchManageEntity::getName, dto.getName())
                 .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), MchManageEntity::getDeptId, dto.getDeptIds())
-                .in(ObjectUtil.isNotEmpty(dto.getIds()), MchManageEntity::getId, dto.getIds());
+                .in(ObjectUtil.isNotEmpty(dto.getIds()), MchManageEntity::getId, dto.getIds())
+                .orderByDesc(MchManageEntity::getCreateTime);
         return selectJoinList(MchManageVo.class, wrapper);
     }
 
@@ -48,7 +50,8 @@ public interface MchManageMapper extends PjcloudBaseMapper<MchManageEntity> {
         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());
+                .in(ObjectUtil.isNotEmpty(dto.getIds()), MchManageEntity::getId, dto.getIds())
+                .orderByDesc(MchManageEntity::getCreateTime);
         Page list = selectPageByScope(page, wrapper, DataScope.of());
         list.setRecords(BeanUtils.toBean(list.getRecords(), MchManageVo.class));
         return list;
@@ -58,7 +61,8 @@ public interface MchManageMapper extends PjcloudBaseMapper<MchManageEntity> {
         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());
+                .in(ObjectUtil.isNotEmpty(dto.getIds()), MchManageEntity::getId, dto.getIds())
+                .orderByDesc(MchManageEntity::getCreateTime);
         return selectListByScope(wrapper, DataScope.of());
     }
 }

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

@@ -21,7 +21,8 @@ public interface WalletActiveMapper extends PjcloudBaseMapper<WalletActiveEntity
                 .likeIfExists(WalletActiveEntity::getCardNumber, dto.getCardNumber())
                 .eqIfExists(WalletActiveEntity::getIsActiveHardware, dto.getIsActiveHardware())
                 .eqIfExists(WalletActiveEntity::getDeptId, dto.getDeptId())
-                .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletActiveEntity::getId, dto.getUserIds());
+                .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletActiveEntity::getId, dto.getUserIds())
+                .orderByDesc(WalletActiveEntity::getCreateTime);
         return selectJoinPage(page, WalletActiveVo.class, wrapper);
     }
 
@@ -30,7 +31,8 @@ public interface WalletActiveMapper extends PjcloudBaseMapper<WalletActiveEntity
                 .like(ObjectUtil.isNotEmpty(dto.getCardNumber()), WalletActiveEntity::getCardNumber, dto.getCardNumber())
                 .eq(ObjectUtil.isNotEmpty(dto.getIsActiveHardware()), WalletActiveEntity::getIsActiveHardware, dto.getIsActiveHardware())
                 .eq(ObjectUtil.isNotEmpty(dto.getDeptId()), WalletActiveEntity::getDeptId, dto.getDeptId())
-                .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletActiveEntity::getId, dto.getUserIds());
+                .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletActiveEntity::getId, dto.getUserIds())
+                .orderByDesc(WalletActiveEntity::getCreateTime);
         Page list = selectPageByScope(page, wrapper, DataScope.of());
         list.setRecords(BeanUtils.toBean(list.getRecords(), WalletActiveVo.class));
         return list;

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

@@ -4,6 +4,7 @@ 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.WalletCodeUseDto;
+import com.bsd.pjcloud.wallet.api.entity.WalletActiveEntity;
 import com.bsd.pjcloud.wallet.api.entity.WalletCodeUseEntity;
 import com.bsd.pjcloud.wallet.api.entity.WalletManageEntity;
 import com.bsd.pjcloud.wallet.api.entity.WalletTypeEntity;
@@ -23,7 +24,8 @@ public interface WalletCodeUseMapper extends PjcloudBaseMapper<WalletCodeUseEnti
                 .eqIfExists(WalletCodeUseEntity::getBizId, dto.getBizId())
                 .eqIfExists(WalletCodeUseEntity::getBizType, dto.getBizType())
                 .eqIfExists(WalletCodeUseEntity::getStatus, dto.getStatus())
-                .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletCodeUseEntity::getUserId, dto.getUserIds());
+                .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletCodeUseEntity::getUserId, dto.getUserIds())
+                .orderByDesc(WalletCodeUseEntity::getCreateTime);
         return selectJoinPage(page, WalletCodeUseVo.class, wrapper);
     }
 }

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

@@ -20,7 +20,8 @@ public interface WalletForeignMapper extends PjcloudBaseMapper<WalletForeignEnti
                 .selectAll(WalletForeignEntity.class)
                 .eqIfExists(WalletForeignEntity::getProcessStatus, dto.getProcessStatus())
                 .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), WalletForeignEntity::getDeptId, dto.getDeptIds())
-                .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletForeignEntity::getUserId, dto.getUserIds());
+                .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletForeignEntity::getUserId, dto.getUserIds())
+                .orderByDesc(WalletForeignEntity::getCreateTime);
         return selectJoinPage(page, WalletForeignVo.class, wrapper);
     }
 
@@ -35,7 +36,8 @@ public interface WalletForeignMapper extends PjcloudBaseMapper<WalletForeignEnti
         LambdaQueryWrapper<WalletForeignEntity> wrapper = new LambdaQueryWrapper<WalletForeignEntity>()
                 .eq(ObjectUtil.isNotEmpty(dto.getProcessStatus()), WalletForeignEntity::getProcessStatus, dto.getProcessStatus())
                 .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), WalletForeignEntity::getDeptId, dto.getDeptIds())
-                .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletForeignEntity::getUserId, dto.getUserIds());
+                .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletForeignEntity::getUserId, dto.getUserIds())
+                .orderByDesc(WalletForeignEntity::getCreateTime);
         Page list = selectPageByScope(page, wrapper, DataScope.of());
         list.setRecords(BeanUtils.toBean(list.getRecords(), WalletForeignVo.class));
         return list;

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

@@ -75,7 +75,8 @@ public interface WalletManageMapper extends PjcloudBaseMapper<WalletManageEntity
                         WalletManageEntity::getCreateTime,
                         ObjectUtil.isNotEmpty(dto.getCreateTimeList()) ? dto.getCreateTimeList()[0] : null,
                         ObjectUtil.isNotEmpty(dto.getCreateTimeList()) ? dto.getCreateTimeList()[1] : null
-                );
+                )
+                .orderByDesc(WalletManageEntity::getCreateTime);
         return selectJoinList(WalletManageVo.class, wrapper);
     }
 
@@ -85,7 +86,8 @@ public interface WalletManageMapper extends PjcloudBaseMapper<WalletManageEntity
                 .eq(ObjectUtil.isNotEmpty(dto.getWalletTypeId()), WalletManageEntity::getWalletTypeId, dto.getWalletTypeId())
                 .eq(ObjectUtil.isNotEmpty(dto.getIsFreeze()), WalletManageEntity::getIsFreeze, dto.getIsFreeze())
                 .in(ObjectUtil.isNotEmpty(dto.getWalletIds()), WalletManageEntity::getId, dto.getWalletIds())
-                .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletManageEntity::getUserId, dto.getUserIds());
+                .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletManageEntity::getUserId, dto.getUserIds())
+                .orderByDesc(WalletManageEntity::getCreateTime);
         return selectList(wrapper);
     }
 
@@ -112,7 +114,8 @@ public interface WalletManageMapper extends PjcloudBaseMapper<WalletManageEntity
                         WalletManageEntity::getCreateTime,
                         ObjectUtil.isNotEmpty(dto.getCreateTimeList()) ? dto.getCreateTimeList()[0] : null,
                         ObjectUtil.isNotEmpty(dto.getCreateTimeList()) ? dto.getCreateTimeList()[1] : null
-                );
+                )
+                .orderByDesc(WalletManageEntity::getCreateTime);
         Page list = selectPageByScope(page, wrapper, dataScope);
         list.setRecords(BeanUtils.toBean(list.getRecords(), WalletManageVo.class));
         return list;

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

@@ -20,7 +20,8 @@ public interface WalletStrideMapper extends PjcloudBaseMapper<WalletStrideEntity
                 .selectAll(WalletStrideEntity.class)
                 .eqIfExists(WalletStrideEntity::getProcessStatus, dto.getProcessStatus())
                 .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), WalletStrideEntity::getDeptId, dto.getDeptIds())
-                .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletStrideEntity::getUserId, dto.getUserIds());
+                .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletStrideEntity::getUserId, dto.getUserIds())
+                .orderByDesc(WalletStrideEntity::getCreateTime);
         return selectJoinPage(page, WalletStrideVo.class, wrapper);
     }
 
@@ -35,7 +36,8 @@ public interface WalletStrideMapper extends PjcloudBaseMapper<WalletStrideEntity
         LambdaQueryWrapper<WalletStrideEntity> wrapper = new LambdaQueryWrapper<WalletStrideEntity>()
                 .eq(ObjectUtil.isNotEmpty(dto.getProcessStatus()), WalletStrideEntity::getProcessStatus, dto.getProcessStatus())
                 .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), WalletStrideEntity::getDeptId, dto.getDeptIds())
-                .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletStrideEntity::getUserId, dto.getUserIds());
+                .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletStrideEntity::getUserId, dto.getUserIds())
+                .orderByDesc(WalletStrideEntity::getCreateTime);
         Page list = selectPageByScope(page, wrapper, DataScope.of());
         list.setRecords(BeanUtils.toBean(list.getRecords(), WalletStrideVo.class));
         return list;

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

@@ -37,7 +37,8 @@ public interface WalletTransactionMapper extends PjcloudBaseMapper<WalletTransac
                 .eqIfExists(WalletTransactionEntity::getBizType, dto.getBizType())
                 .eqIfExists(WalletManageEntity::getWalletTypeId, dto.getWalletTypeId())
                 .in(ObjectUtil.isNotEmpty(dto.getBizTypes()), WalletTransactionEntity::getBizType, dto.getBizTypes())
-                .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletManageEntity::getUserId, dto.getUserIds());
+                .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletManageEntity::getUserId, dto.getUserIds())
+                .orderByDesc(WalletTransactionEntity::getCreateTime);
         if (ObjectUtil.equals(dto.getType(), WalletTransactionDto.TYPE_INCOME)) {
             wrapper.gt(WalletTransactionEntity::getPrice, 0);
         } else if (Objects.equals(dto.getType(), WalletTransactionDto.TYPE_EXPENSE)) {
@@ -57,7 +58,8 @@ public interface WalletTransactionMapper extends PjcloudBaseMapper<WalletTransac
                         WalletTransactionEntity::getCreateTime,
                         ObjectUtil.isNotEmpty(dto.getCreateTimeList()) ? dto.getCreateTimeList()[0] : null,
                         ObjectUtil.isNotEmpty(dto.getCreateTimeList()) ? dto.getCreateTimeList()[1] : null
-                );
+                )
+                .orderByDesc(WalletTransactionEntity::getCreateTime);
         if (ObjectUtil.equals(dto.getType(), WalletTransactionDto.TYPE_INCOME)) {
             wrapper.gt(WalletTransactionEntity::getPrice, 0);
         } else if (Objects.equals(dto.getType(), WalletTransactionDto.TYPE_EXPENSE)) {

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

@@ -10,6 +10,7 @@ import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargeApplyDto;
 import com.bsd.pjcloud.wallet.api.entity.WalletManageEntity;
 import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeApplyEntity;
 import com.bsd.pjcloud.wallet.api.entity.WalletTypeEntity;
+import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeImportEntity;
 import com.bsd.pjcloud.wallet.api.vo.recharge.WalletRechargeApplyVo;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -27,7 +28,8 @@ public interface WalletRechargeApplyMapper extends PjcloudBaseMapper<WalletRecha
                 .leftJoin(WalletTypeEntity.class, WalletTypeEntity::getId, WalletRechargeApplyEntity::getWalletTypeId)
                 .eqIfExists(WalletRechargeApplyEntity::getWalletTypeId, dto.getWalletTypeId())
                 .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletManageEntity::getUserId, dto.getUserIds())
-                .in(ObjectUtil.isNotEmpty(dto.getWalletTypeIds()), WalletManageEntity::getWalletTypeId, dto.getWalletTypeIds());
+                .in(ObjectUtil.isNotEmpty(dto.getWalletTypeIds()), WalletManageEntity::getWalletTypeId, dto.getWalletTypeIds())
+                .orderByDesc(WalletRechargeApplyEntity::getCreateTime);
         return selectJoinPage(page, WalletRechargeApplyVo.class, wrapper);
     }
 
@@ -39,7 +41,8 @@ public interface WalletRechargeApplyMapper extends PjcloudBaseMapper<WalletRecha
                 .leftJoin(WalletTypeEntity.class, WalletTypeEntity::getId, WalletRechargeApplyEntity::getWalletTypeId)
                 .eqIfExists(WalletRechargeApplyEntity::getWalletTypeId, dto.getWalletTypeId())
                 .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletManageEntity::getUserId, dto.getUserIds())
-                .in(ObjectUtil.isNotEmpty(dto.getWalletTypeIds()), WalletManageEntity::getWalletTypeId, dto.getWalletTypeIds());
+                .in(ObjectUtil.isNotEmpty(dto.getWalletTypeIds()), WalletManageEntity::getWalletTypeId, dto.getWalletTypeIds())
+                .orderByDesc(WalletRechargeApplyEntity::getCreateTime);
         return selectJoinList(WalletRechargeApplyVo.class, wrapper);
     }
 
@@ -48,7 +51,8 @@ public interface WalletRechargeApplyMapper extends PjcloudBaseMapper<WalletRecha
         LambdaQueryWrapper<WalletRechargeApplyEntity> wrapper = new LambdaQueryWrapper<WalletRechargeApplyEntity>()
                 .eq(ObjectUtil.isNotEmpty(dto.getWalletTypeId()), WalletRechargeApplyEntity::getWalletTypeId, dto.getWalletTypeId())
                 .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletRechargeApplyEntity::getUserId, dto.getUserIds())
-                .in(ObjectUtil.isNotEmpty(dto.getWalletTypeIds()), WalletRechargeApplyEntity::getWalletTypeId, dto.getWalletTypeIds());
+                .in(ObjectUtil.isNotEmpty(dto.getWalletTypeIds()), WalletRechargeApplyEntity::getWalletTypeId, dto.getWalletTypeIds())
+                .orderByDesc(WalletRechargeApplyEntity::getCreateTime);
         Page list = selectPageByScope(page, wrapper, DataScope.of());
         list.setRecords(BeanUtils.toBean(list.getRecords(), WalletRechargeApplyVo.class));
         return list;

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

@@ -20,14 +20,16 @@ public interface WalletRechargeImportMapper extends PjcloudBaseMapper<WalletRech
     default Page<WalletRechargeImportVo> pageJoin(Page page, WalletRechargeImportDto dto) {
         MPJLambdaWrapper<WalletRechargeImportEntity> wrapper = new MPJLambdaWrapper<WalletRechargeImportEntity>()
                 .eqIfExists(WalletRechargeImportEntity::getId, dto.getId())
-                .eqIfExists(WalletRechargeImportEntity::getApplyId, dto.getApplyId());
+                .eqIfExists(WalletRechargeImportEntity::getApplyId, dto.getApplyId())
+                .orderByDesc(WalletRechargeImportEntity::getCreateTime);
         return selectJoinPage(page, WalletRechargeImportVo.class, wrapper);
     }
 
     default List<WalletRechargeImportVo> listJoin(WalletRechargeImportDto dto) {
         MPJLambdaWrapper<WalletRechargeImportEntity> wrapper = new MPJLambdaWrapper<WalletRechargeImportEntity>()
                 .eqIfExists(WalletRechargeImportEntity::getId, dto.getId())
-                .eqIfExists(WalletRechargeImportEntity::getApplyId, dto.getApplyId());
+                .eqIfExists(WalletRechargeImportEntity::getApplyId, dto.getApplyId())
+                .orderByDesc(WalletRechargeImportEntity::getCreateTime);
         return selectJoinList(WalletRechargeImportVo.class, wrapper);
     }
 }

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

@@ -15,7 +15,8 @@ public interface WalletRechargePackageMapper extends PjcloudBaseMapper<WalletRec
 
 
     default Page<WalletRechargePackageVo> pageJoin(Page page, WalletRechargePackageDto dto) {
-        MPJLambdaWrapper<WalletRechargePackageEntity> wrapper = new MPJLambdaWrapper<WalletRechargePackageEntity>();
+        MPJLambdaWrapper<WalletRechargePackageEntity> wrapper = new MPJLambdaWrapper<WalletRechargePackageEntity>()
+                .orderByDesc(WalletRechargePackageEntity::getCreateTime);
         return selectJoinPage(page, WalletRechargePackageEntity.class, wrapper);
     }
 }

pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeImportMapper.xml

@@ -85,5 +85,6 @@
                 and p.process_time between #{dto.processTimeList[0]} and #{dto.processTimeList[1]}
             </if>
         </where>
+        order by a.create_time desc
     </select>
 </mapper>