lywsvip/likeadmin_java
1
0
Fork 0
mirror of https://gitee.com/likeadmin/likeadmin_java.git synced 2026-06-06 11:40:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
pan.wl.2
2024-11-13 14:12:16 +08:00
parent d604ec73e4 68da8fc926
commit b7008b5275
185 changed files with 203 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java
View File

@@ -83,7 +83,7 @@ public class PayServiceImpl implements IPayService {
List<DevPayWay> devPayWays = devPayWayMapper.selectList(
new QueryWrapper<DevPayWay>()
.eq("scene", terminal)
.eq("status", YesNoEnum.YES.getCode()).orderByDesc("is_default").orderByAsc("id"));
.eq("status", YesNoEnum.YES.getCode()).orderByDesc("id"));
PayWayListVo vo = new PayWayListVo();
if (from.equals("recharge")) {
@@ -113,10 +113,11 @@ public class PayServiceImpl implements IPayService {
if (devPayConfig.getPayWay().equals(PaymentEnum.ALI_PAY.getCode())) {
infoVo.setExtra("支付宝快捷支付");
}
list.add(infoVo);
}
Collections.sort(list, Comparator.comparing(PayWayInfoVo::getSort).reversed()
.thenComparing(Comparator.comparingInt(PayWayInfoVo::getId).reversed()));
vo.setLists(list);
return vo;
}