From 4ba65bfad8422385efe0cac3e36b343746123dda Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 23 Jan 2025 17:00:47 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=E6=81=A2=E5=A4=8D=E5=85=85=E5=80=BC?= =?UTF-8?q?=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WalletRechargeImportController.java | 8 ++++ .../service/WalletRechargeImportService.java | 2 + .../WalletRechargeApplyServiceImpl.java | 2 +- .../WalletRechargeImportServiceImpl.java | 38 ++++++++++++++++++- 4 files changed, 47 insertions(+), 3 deletions(-) diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeImportController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeImportController.java index 44b8526ef..d110e5e36 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeImportController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeImportController.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.data.datascope.DataScope; +import com.bsd.pjcloud.common.idempotent.annotation.Idempotent; import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargeImportDto; import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeImportEntity; @@ -39,6 +40,13 @@ public class WalletRechargeImportController { private final WalletRechargeImportService walletRechargeImportService; + @Operation(summary = "恢复", description = "恢复") + @Idempotent(expireTime = 5, info = "正在处理中，请勿重复操作") + @GetMapping("/recover") + public R recover(@RequestParam Long id) { + return R.ok(walletRechargeImportService.recover(id)); + } + @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") @PreAuthorize("@pms.hasPermission('wallet_walletRechargeImport_view')") diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargeImportService.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargeImportService.java index c3ef45338..49fb414bd 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargeImportService.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargeImportService.java @@ -17,4 +17,6 @@ public interface WalletRechargeImportService extends IService listJoin(WalletRechargeImportDto dto); Page scopePageList(Page page, WalletRechargeImportDto dto, DataScope dataScope); + + Boolean recover(Long id); } \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeApplyServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeApplyServiceImpl.java index 1f5e9a8e8..3bc6b2c0e 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeApplyServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeApplyServiceImpl.java @@ -312,7 +312,7 @@ public class WalletRechargeApplyServiceImpl extends ServiceImpl implements WalletRechargeImportService { + @Lazy + private final WalletRechargeApplyService walletRechargeApplyService; + private final WalletTransactionService walletTransactionService; + private final WalletManageService walletManageService; + private final WalletTypeMapper walletTypeMapper; private final RemoteUserService userService; @@ -104,4 +116,26 @@ public class WalletRechargeImportServiceImpl extends ServiceImpl() + .eq(WalletTransactionEntity::getBizId, String.valueOf(rechargeImport.getId())) + ); + if (ObjectUtil.isNotEmpty(walletTransaction)) throw new RuntimeException("钱包已经充值过"); + WalletManageEntity wallet = walletManageService.getOrCreateWallet(rechargeImport.getUserId(), walletTypeEnum); + if (ObjectUtil.isEmpty(wallet)) throw new RuntimeException("钱包错误"); + walletTransactionService.addWalletBalance(wallet.getId(), rechargeImport.getPrice(), String.valueOf(rechargeImport.getId()), WalletBizEnum.BATCH); + return true; + } } \ No newline at end of file From 76d5d9ad2aea11eb56d3fe79d8aaa2dc96cd267c Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 23 Jan 2025 17:15:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=E7=A1=AC=E4=BB=B6=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=80=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bsd/pjcloud/hard/mapper/HardGroupMapper.java | 9 ++++++--- .../com/bsd/pjcloud/hard/mapper/HardInvoiceMapper.java | 6 ++---- .../com/bsd/pjcloud/hard/mapper/HardManagerMapper.java | 6 ++++-- .../pjcloud/hard/mapper/order/HardAfterSaleMapper.java | 4 +++- .../bsd/pjcloud/hard/mapper/order/HardOrderMapper.java | 6 ++++-- .../src/main/resources/mapper/HardInvoiceMapper.xml | 1 + .../main/resources/mapper/order/HardAfterSaleMapper.xml | 1 + 7 files changed, 21 insertions(+), 12 deletions(-) diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardGroupMapper.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardGroupMapper.java index 69bf45497..733add50d 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardGroupMapper.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardGroupMapper.java @@ -19,13 +19,15 @@ public interface HardGroupMapper extends PjcloudBaseMapper { default Page pageJoin(Page page, HardGroupDto dto) { MPJLambdaWrapper wrapper = new MPJLambdaWrapper() - .like(ObjectUtil.isNotEmpty(dto.getName()),HardGroupEntity::getName, dto.getName()); + .like(ObjectUtil.isNotEmpty(dto.getName()), HardGroupEntity::getName, dto.getName()) + .orderByDesc(HardGroupEntity::getCreateTime); return selectJoinPage(page, HardGroupVo.class, wrapper); } default Page scopePageList(Page page, HardGroupDto dto) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper() - .like(ObjectUtil.isNotEmpty(dto.getName()), HardGroupEntity::getName, dto.getName()); + .like(ObjectUtil.isNotEmpty(dto.getName()), HardGroupEntity::getName, dto.getName()) + .orderByDesc(HardGroupEntity::getCreateTime); Page list = selectPageByScope(page, wrapper, DataScope.of()); list.setRecords(BeanUtils.toBean(list.getRecords(), HardGroupVo.class)); return list; @@ -34,7 +36,8 @@ public interface HardGroupMapper extends PjcloudBaseMapper { default List list(HardGroupDto dto) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper() .like(ObjectUtil.isNotEmpty(dto.getName()), HardGroupEntity::getName, dto.getName()) - .in(ObjectUtil.isNotEmpty(dto.getIds()), HardGroupEntity::getId, dto.getIds()); + .in(ObjectUtil.isNotEmpty(dto.getIds()), HardGroupEntity::getId, dto.getIds()) + .orderByDesc(HardGroupEntity::getCreateTime); return selectList(wrapper); } } \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardInvoiceMapper.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardInvoiceMapper.java index 923eb4a67..61e9f5075 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardInvoiceMapper.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardInvoiceMapper.java @@ -1,9 +1,6 @@ package com.bsd.pjcloud.hard.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.hard.api.dto.HardInvoiceDto; @@ -20,7 +17,8 @@ public interface HardInvoiceMapper extends PjcloudBaseMapper MPJLambdaWrapper wrapper = new MPJLambdaWrapper() .selectAll(HardInvoiceEntity.class) .eqIfExists(HardInvoiceEntity::getHardId, dto.getHardId()) - .eqIfExists(HardInvoiceEntity::getOrderId, dto.getOrderId()); + .eqIfExists(HardInvoiceEntity::getOrderId, dto.getOrderId()) + .orderByDesc(HardInvoiceEntity::getCreateTime); return selectJoinPage(page, HardInvoiceVo.class, wrapper); } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardManagerMapper.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardManagerMapper.java index 95c88ee67..16af55597 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardManagerMapper.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardManagerMapper.java @@ -25,7 +25,8 @@ public interface HardManagerMapper extends PjcloudBaseMapper .eqIfExists(HardManagerEntity::getType, dto.getType()) .eqIfExists(HardManagerEntity::getMerchantId, dto.getMerchantId()) .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), HardManagerEntity::getDeptId, dto.getDeptIds()) - .in(ObjectUtil.isNotEmpty(dto.getMerchantIds()), HardManagerEntity::getMerchantId, dto.getMerchantIds()); + .in(ObjectUtil.isNotEmpty(dto.getMerchantIds()), HardManagerEntity::getMerchantId, dto.getMerchantIds()) + .orderByDesc(HardManagerEntity::getCreateTime); return selectJoinPage(page, HardManagerVo.class, wrapper); } @@ -43,7 +44,8 @@ public interface HardManagerMapper extends PjcloudBaseMapper .eq(ObjectUtil.isNotEmpty(dto.getType()), HardManagerEntity::getType, dto.getType()) .eq(ObjectUtil.isNotEmpty(dto.getType()), HardManagerEntity::getMerchantId, dto.getMerchantId()) .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), HardManagerEntity::getDeptId, dto.getDeptIds()) - .in(ObjectUtil.isNotEmpty(dto.getMerchantIds()), HardManagerEntity::getMerchantId, dto.getMerchantIds()); + .in(ObjectUtil.isNotEmpty(dto.getMerchantIds()), HardManagerEntity::getMerchantId, dto.getMerchantIds()) + .orderByDesc(HardManagerEntity::getCreateTime); Page list = selectPageByScope(page, wrapper, DataScope.of()); list.setRecords(BeanUtils.toBean(list.getRecords(), HardManagerVo.class)); return list; diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardAfterSaleMapper.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardAfterSaleMapper.java index 88bcbe999..53c8b828c 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardAfterSaleMapper.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardAfterSaleMapper.java @@ -5,6 +5,7 @@ import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; import com.bsd.pjcloud.hard.api.dto.order.HardAfterSaleDto; import com.bsd.pjcloud.hard.api.entity.order.HardAfterSaleEntity; +import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity; import com.bsd.pjcloud.hard.api.vo.order.HardAfterSaleVo; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Mapper; @@ -15,7 +16,8 @@ public interface HardAfterSaleMapper extends PjcloudBaseMapper pageJoin(Page page, HardAfterSaleDto dto) { MPJLambdaWrapper wrapper = new MPJLambdaWrapper() - .selectAll(HardAfterSaleEntity.class); + .selectAll(HardAfterSaleEntity.class) + .orderByDesc(HardAfterSaleEntity::getCreateTime); return selectJoinPage(page, HardAfterSaleVo.class, wrapper); } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardOrderMapper.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardOrderMapper.java index 1f3a99c1f..370a9d552 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardOrderMapper.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardOrderMapper.java @@ -45,7 +45,8 @@ public interface HardOrderMapper extends PjcloudBaseMapper { HardOrderEntity::getPayTime, ObjectUtil.isNotEmpty(dto.getPayTimeList()) ? dto.getPayTimeList()[0] : null, ObjectUtil.isNotEmpty(dto.getPayTimeList()) ? dto.getPayTimeList()[1] : null - ); + ) + .orderByDesc(HardOrderEntity::getCreateTime); Page list = selectPageByScope(page, wrapper, DataScope.of()); list.setRecords(BeanUtils.toBean(list.getRecords(), HardOrderVo.class)); return list; @@ -60,7 +61,8 @@ public interface HardOrderMapper extends PjcloudBaseMapper { .eqIfExists(HardOrderEntity::getOrderType, dto.getOrderType()) .eqIfExists(HardOrderEntity::getPayType, dto.getPayType()) .eqIfExists(HardOrderEntity::getOrderStatus, dto.getOrderStatus()) - .in(ObjectUtil.isNotEmpty(dto.getUserIds()), HardOrderEntity::getUserId, dto.getUserIds()); + .in(ObjectUtil.isNotEmpty(dto.getUserIds()), HardOrderEntity::getUserId, dto.getUserIds()) + .orderByDesc(HardOrderEntity::getCreateTime); return selectJoinPage(page, HardOrderVo.class, wrapper); } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardInvoiceMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardInvoiceMapper.xml index 9f2c57a10..851124df9 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardInvoiceMapper.xml +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardInvoiceMapper.xml @@ -82,5 +82,6 @@ + order by a.create_time desc \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardAfterSaleMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardAfterSaleMapper.xml index 8e77b060f..0788bbb82 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardAfterSaleMapper.xml +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardAfterSaleMapper.xml @@ -93,5 +93,6 @@ + order by a.create_time desc \ No newline at end of file From fbf6d10da8af908a232fbc97a76642c8a263262b Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 23 Jan 2025 17:46:57 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=E6=81=A2=E5=A4=8D=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/recharge/WalletRechargeImportController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeImportController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeImportController.java index d110e5e36..6696271ff 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeImportController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeImportController.java @@ -43,6 +43,7 @@ public class WalletRechargeImportController { @Operation(summary = "恢复", description = "恢复") @Idempotent(expireTime = 5, info = "正在处理中，请勿重复操作") @GetMapping("/recover") + @PreAuthorize("@pms.hasPermission('wallet_walletRechargeImport_recover')") public R recover(@RequestParam Long id) { return R.ok(walletRechargeImportService.recover(id)); } From 0b43f24a202a60e5fa83bbdb5ffdd3119a092f1d Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 23 Jan 2025 18:21:19 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:=E9=92=B1=E5=8C=85=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=80=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wallet/controller/WalletTypeController.java | 1 + .../recharge/WalletRechargePackageController.java | 1 + .../bsd/pjcloud/wallet/mapper/MchManageMapper.java | 12 ++++++++---- .../pjcloud/wallet/mapper/WalletActiveMapper.java | 6 ++++-- .../pjcloud/wallet/mapper/WalletCodeUseMapper.java | 4 +++- .../pjcloud/wallet/mapper/WalletForeignMapper.java | 6 ++++-- .../pjcloud/wallet/mapper/WalletManageMapper.java | 9 ++++++--- .../pjcloud/wallet/mapper/WalletStrideMapper.java | 6 ++++-- .../wallet/mapper/WalletTransactionMapper.java | 6 ++++-- .../mapper/recharge/WalletRechargeApplyMapper.java | 10 +++++++--- .../mapper/recharge/WalletRechargeImportMapper.java | 6 ++++-- .../mapper/recharge/WalletRechargePackageMapper.java | 3 ++- .../mapper/recharge/WalletRechargeImportMapper.xml | 1 + 13 files changed, 49 insertions(+), 22 deletions(-) diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTypeController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTypeController.java index 5c5cae8f6..d8e5a71f6 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTypeController.java +++ b/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 wrapper = Wrappers.lambdaQuery(); + wrapper.orderByDesc(WalletTypeEntity::getCreateTime); return R.ok(walletTypeService.page(page, wrapper)); } diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargePackageController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargePackageController.java index 1d02957ed..ce59a3604 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargePackageController.java +++ b/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 wrapper = Wrappers.lambdaQuery(); + wrapper.orderByDesc(WalletRechargePackageEntity::getCreateTime); return R.ok(walletRechargePackageService.page(page, wrapper)); } diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java index 3eaaffbe6..be4a36c55 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java @@ -24,7 +24,8 @@ public interface MchManageMapper extends PjcloudBaseMapper { .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 { .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 { LambdaQueryWrapper wrapper = new LambdaQueryWrapper() .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 { LambdaQueryWrapper wrapper = new LambdaQueryWrapper() .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()); } } \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletActiveMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletActiveMapper.java index cb8cb3ca3..6dafa0cb4 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletActiveMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletActiveMapper.java @@ -21,7 +21,8 @@ public interface WalletActiveMapper extends PjcloudBaseMapper wrapper = new LambdaQueryWrapper() .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; diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java index e1c871278..55a815371 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java @@ -75,7 +75,8 @@ public interface WalletManageMapper extends PjcloudBaseMapper wrapper = new LambdaQueryWrapper() .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; diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletTransactionMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletTransactionMapper.java index 314f94fb3..ee718d60f 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletTransactionMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletTransactionMapper.java @@ -37,7 +37,8 @@ public interface WalletTransactionMapper extends PjcloudBaseMapper wrapper = new LambdaQueryWrapper() .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; diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeImportMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeImportMapper.java index a4104f25b..a1fbbcbaa 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeImportMapper.java +++ b/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 pageJoin(Page page, WalletRechargeImportDto dto) { MPJLambdaWrapper wrapper = new MPJLambdaWrapper() .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 listJoin(WalletRechargeImportDto dto) { MPJLambdaWrapper wrapper = new MPJLambdaWrapper() .eqIfExists(WalletRechargeImportEntity::getId, dto.getId()) - .eqIfExists(WalletRechargeImportEntity::getApplyId, dto.getApplyId()); + .eqIfExists(WalletRechargeImportEntity::getApplyId, dto.getApplyId()) + .orderByDesc(WalletRechargeImportEntity::getCreateTime); return selectJoinList(WalletRechargeImportVo.class, wrapper); } } \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargePackageMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargePackageMapper.java index 90eda03c7..4696e6b29 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargePackageMapper.java +++ b/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 pageJoin(Page page, WalletRechargePackageDto dto) { - MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + MPJLambdaWrapper wrapper = new MPJLambdaWrapper() + .orderByDesc(WalletRechargePackageEntity::getCreateTime); return selectJoinPage(page, WalletRechargePackageEntity.class, wrapper); } } \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeImportMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeImportMapper.xml index f33ab7d87..798eb0639 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeImportMapper.xml +++ b/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]} + order by a.create_time desc \ No newline at end of file From daee494a4401a4bb48dd9fedbac64656c3889554 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 23 Jan 2025 20:06:06 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=E9=92=B1=E5=8C=85=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bsd/pjcloud/wallet/api/constant/WalletBizEnum.java | 9 +++++++++ .../wallet/controller/WalletTransactionController.java | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletBizEnum.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletBizEnum.java index 671866c14..6d582e8bf 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletBizEnum.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletBizEnum.java @@ -5,6 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; import java.util.Arrays; +import java.util.List; @Getter @AllArgsConstructor @@ -19,6 +20,14 @@ public enum WalletBizEnum { private final String desc; + public static List getTopUpCodes() { + return List.of( + WalletBizEnum.UPDATE.getCode(), + WalletBizEnum.BATCH.getCode(), + WalletBizEnum.RECHARGE.getCode() + ); + } + public static WalletBizEnum descOf(String description) { return Arrays.stream(WalletBizEnum.values()) .filter(v -> ObjectUtil.equal(v.getDesc(), description)) diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java index 514f84548..f9ccbcf5b 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java @@ -95,7 +95,8 @@ public class WalletTransactionController { @Operation(summary = "后台充值分页", description = "后台充值分页") @GetMapping("/page-cz") public R pageCz(@ParameterObject Page page, @ParameterObject WalletTransactionDto dto) { - dto.setBizTypes(List.of(WalletBizEnum.RECHARGE.getCode())); + dto.setBizTypes(WalletBizEnum.getTopUpCodes()); + dto.setType(WalletTransactionDto.TYPE_INCOME); DataScope dataScope = new DataScope(); return R.ok(walletTransactionService.scopePageList(page, dto, dataScope)); }