perf(基础平台): 获取人员正常卡片时将卡片按最新变更时间到序排列

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/service/impl/PtCardServiceImpl.java

@@ -98,7 +98,7 @@ public class PtCardServiceImpl implements IPtCardService {
         if (ObjUtil.isNotNull(list) && !list.isEmpty()) {
             list.parallelStream().forEach(p -> {
                 PtCardtypeVo cardTypeVo = cardTypeService.queryByCode(p.getCardType());
-                if(cardTypeVo != null){
+                if (cardTypeVo != null) {
                     p.setCardTypeName(cardTypeVo.getTypeName());
                 }
             });
@@ -219,10 +219,10 @@ public class PtCardServiceImpl implements IPtCardService {
     public int resetLifespan(Long[] userIds, String lifespan) {
         for (Long userId : userIds) {
             baseMapper.update(null, new LambdaUpdateWrapper<PtCard>()
-                                        .set(PtCard::getLifespan, lifespan)
-                                        .set(PtCard::getChangeTime, DateUtil.date())
-                                        .eq(PtCard::getStatus, '1')
-                                        .eq(PtCard::getUserId, userId));
+                .set(PtCard::getLifespan, lifespan)
+                .set(PtCard::getChangeTime, DateUtil.date())
+                .eq(PtCard::getStatus, '1')
+                .eq(PtCard::getUserId, userId));
             // sendCloudConsume(baseMapper.selectVoById(userId));
         }
         return userIds.length;
@@ -241,10 +241,10 @@ public class PtCardServiceImpl implements IPtCardService {
     public int resetCardType(Long[] userIds, String cardType) {
         Arrays.stream(userIds).forEach(userId -> {
             baseMapper.update(null, new LambdaUpdateWrapper<PtCard>()
-                                        .set(PtCard::getCardType, cardType)
-                                        .set(PtCard::getChangeTime, DateUtil.date())
-                                        .eq(PtCard::getStatus, '1')
-                                        .eq(PtCard::getUserId, userId));
+                .set(PtCard::getCardType, cardType)
+                .set(PtCard::getChangeTime, DateUtil.date())
+                .eq(PtCard::getStatus, '1')
+                .eq(PtCard::getUserId, userId));
             // sendCloudConsume(baseMapper.selectVoById(userId));
         });
         return userIds.length;
@@ -286,10 +286,10 @@ public class PtCardServiceImpl implements IPtCardService {
     public boolean lockCard(Long cardId) {
         // sendCloudConsume(baseMapper.selectVoById(cardId));
         return baseMapper.update(null, new LambdaUpdateWrapper<PtCard>()
-                                           .set(PtCard::getStatus, '2')
-                                           .set(PtCard::getChangeTime, DateUtil.date())
-                                           .eq(PtCard::getStatus, '1')
-                                           .eq(PtCard::getCardId, cardId)) > 0;
+            .set(PtCard::getStatus, '2')
+            .set(PtCard::getChangeTime, DateUtil.date())
+            .eq(PtCard::getStatus, '1')
+            .eq(PtCard::getCardId, cardId)) > 0;
     }
 
     /**
@@ -302,10 +302,10 @@ public class PtCardServiceImpl implements IPtCardService {
     public boolean unlockCard(Long cardId) {
         // sendCloudConsume(baseMapper.selectVoById(cardId));
         return baseMapper.update(null, new LambdaUpdateWrapper<PtCard>()
-                                           .set(PtCard::getStatus, '1')
-                                           .set(PtCard::getChangeTime, DateUtil.date())
-                                           .eq(PtCard::getStatus, '2')
-                                           .eq(PtCard::getCardId, cardId)) > 0;
+            .set(PtCard::getStatus, '1')
+            .set(PtCard::getChangeTime, DateUtil.date())
+            .eq(PtCard::getStatus, '2')
+            .eq(PtCard::getCardId, cardId)) > 0;
     }
 
     /**
@@ -329,7 +329,7 @@ public class PtCardServiceImpl implements IPtCardService {
             if (Constants.TAKE_COMMISSION.equals(commType)) {
                 // 按比例收取
                 commission = bo.getReceiptMoney().multiply(commissionRate.divide(new BigDecimal(100), 2, RoundingMode.HALF_UP)).setScale(2,
-                                                                                                                                         RoundingMode.HALF_UP);
+                    RoundingMode.HALF_UP);
             } else {
                 // 直接设置
                 commission = commissionRate;
@@ -566,10 +566,10 @@ public class PtCardServiceImpl implements IPtCardService {
     @Override
     public Boolean cancelCard(Long userId, Long operatorId) {
         LambdaUpdateWrapper<PtCard> luw = new LambdaUpdateWrapper<PtCard>().set(PtCard::getStatus, CardStatusEnum.CLOSE.code().toString())
-                                              .set(PtCard::getChangeTime, DateUtil.date())
-                                              .set(PtCard::getUpdateBy, operatorId)
-                                              .eq(PtCard::getUserId, userId)
-                                              .eq(PtCard::getStatus, CardStatusEnum.NORMAL.code().toString());
+            .set(PtCard::getChangeTime, DateUtil.date())
+            .set(PtCard::getUpdateBy, operatorId)
+            .eq(PtCard::getUserId, userId)
+            .eq(PtCard::getStatus, CardStatusEnum.NORMAL.code().toString());
         return baseMapper.update(null, luw) >= 0;
     }
 
@@ -591,15 +591,16 @@ public class PtCardServiceImpl implements IPtCardService {
     @Override
     public List<PtCardVo> selectNormalCards() {
         LambdaQueryWrapper<PtCard> lqw = new LambdaQueryWrapper<PtCard>()
-                                             .eq(PtCard::getStatus, CardStatusEnum.NORMAL.code().toString())
-                                             .eq(PtCard::getDelFlag,"0")
-                                             .ge(PtCard::getLifespan,DateUtil.date());
+            .eq(PtCard::getStatus, CardStatusEnum.NORMAL.code().toString())
+            .eq(PtCard::getDelFlag, "0")
+            .ge(PtCard::getLifespan, DateUtil.date())
+            .orderByDesc(PtCard::getChangeTime);
         return baseMapper.selectVoList(lqw);
     }
 
     @Override
     public Boolean updateCardDayData(PtCardBo bo) {
         PtCard update = MapstructUtils.convert(bo, PtCard.class);
-        return baseMapper.updateById(update)>0;
+        return baseMapper.updateById(update) > 0;
     }
 }