123

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/BaseOrderRevenueVo.java

@@ -29,9 +29,17 @@ public class BaseOrderRevenueVo extends BaseOrderRevenue {
             String[] values = type.split(",");
             List<String> list = Arrays.asList(values);
             if (list.contains(CompanyWalletSourceEnum.VEHICLE.getCode()+"")) {
-                showTypeStr = "租赁费";
+                if (list.contains(CompanyWalletSourceEnum.WATER.getCode()+"")){
+                    showTypeStr = "租赁费+上级拥金";
+                }else {
+                    showTypeStr = "租赁费";
+                }
             } else if (list.contains(CompanyWalletSourceEnum.WATER.getCode()+"")) {
-                showTypeStr = "租赁费+上级拥金";
+                if (list.contains(CompanyWalletSourceEnum.VEHICLE.getCode()+"")){
+                    showTypeStr = "租赁费+上级拥金";
+                }else {
+                    showTypeStr = "上级拥金";
+                }
             } else if (list.contains(CompanyWalletSourceEnum.REGULATION.getCode()+"")) {
                 showTypeStr = "违章金";
             }