CC/ruoyi-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
van
2026-07-28 19:12:04 +08:00
parent 941b7f0ae6
commit f94cd3e4cd
3 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/OrderRowsController.java
View File

@@ -218,12 +218,12 @@ public class OrderRowsController extends BaseController
Map<String, List<String>> groups = new HashMap<>();
groups.put("cancel", Arrays.asList("3"));
groups.put("invalid", Arrays.asList("2","4","5","6","7","8","9","10","11","14","19","20","21","22","23","29","30","31","32","33","34"));
groups.put("invalid", ValidCodeConverter.toCodeStrings(ValidCodeConverter.INVALID_CODES));
groups.put("pending", Arrays.asList("15"));
groups.put("paid", Arrays.asList("16"));
groups.put("finished", Arrays.asList("17"));
groups.put("deposit", Arrays.asList("24"));
groups.put("illegal", Arrays.asList("25","26","27","28"));
groups.put("illegal", ValidCodeConverter.toCodeStrings(ValidCodeConverter.ILLEGAL_CODES));
Map<String, Map<String, Object>> groupStats = new HashMap<>();
groupStats.put("cancel", createGroupStat("取消", "cancel"));
@@ -253,8 +253,7 @@ public class OrderRowsController extends BaseController
String validCode = row.getValidCode() != null ? String.valueOf(row.getValidCode()) : null;
boolean isCancel = "3".equals(validCode);
boolean isIllegal = "25".equals(validCode) || "26".equals(validCode)
|| "27".equals(validCode) || "28".equals(validCode);
boolean isIllegal = ValidCodeConverter.isIllegal(row.getValidCode());
double commissionAmount = 0.0;
double actualFeeAmount = 0.0;