11

pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml

@@ -439,13 +439,13 @@
                 order by a.verification_time desc, a.id desc
             </when>
             <when test="dto.apptUseDateTimeList != null and dto.apptUseDateTimeList.length == 2">
-                order by a.appt_use_date desc, a.hour_type asc, a.id desc
+                order by a.appt_use_date desc, a.pay_time desc, a.id desc
             </when>
             <when test="dto.updateTimeList != null and dto.updateTimeList.length == 2">
                 order by a.update_time desc, a.id desc
             </when>
             <otherwise>
-                order by a.create_time desc, a.user_id desc
+                order by a.appt_use_date desc, a.pay_time desc, a.id desc
             </otherwise>
         </choose>
     </select>

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

@@ -140,9 +140,11 @@ public class WalletManageController {
     }
 
     private R<List<WalletManageVo>> listWalletByIds(List<Long> walletIds) {
+        // 内部接口无用户凭证，不能走依赖 UPMS 数据权限的 scopeList；
+        // 钱包主键已由调用方业务记录过滤，这里直接按主键联查钱包类型返回。
         WalletManageDto dto = new WalletManageDto();
         dto.setWalletIds(walletIds);
-        List<WalletManageVo> wallet = walletManageService.scopeList(dto, null);
+        List<WalletManageVo> wallet = walletManageMapper.joinList(dto);
         if (ObjectUtil.isEmpty(wallet)) return R.failed("钱包不存在");
         return R.ok(wallet);
     }

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

@@ -134,6 +134,7 @@ public interface WalletManageMapper extends PjcloudBaseMapper<WalletManageEntity
                 .leftJoin(WalletTypeEntity.class, WalletTypeEntity::getId, WalletManageEntity::getWalletTypeId)
                 .eqIfExists(WalletManageEntity::getUserId, dto.getUserId())
                 .eqIfExists(WalletManageEntity::getWalletTypeId, dto.getWalletTypeId())
+                .in(ObjectUtil.isNotEmpty(dto.getWalletIds()), WalletManageEntity::getId, dto.getWalletIds())
                 .eqIfExists(WalletManageEntity::getIsFreeze, dto.getIsFreeze())
                 .likeIfExists(WalletManageEntity::getCardNumber, dto.getCardNumber())
                 .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletManageEntity::getUserId, dto.getUserIds())