feat:钱包权限

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/utils/WalletDataUtil.java

@@ -27,7 +27,7 @@ public class WalletDataUtil {
         return v;
     }
 
-    public <T extends BaseWalletTypeInterface> List<T> convertWalletTYpeList(List<T> list, Map<Long, WalletTypeEntity> map) {
+    public <T extends BaseWalletTypeInterface> List<T> convertWalletTypeList(List<T> list, Map<Long, WalletTypeEntity> map) {
         return CollectionUtils.convertList(list, v -> convertWalletType(v, map.get(v.getWalletTypeId())));
     }
 

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/WalletFreezeVo.java

@@ -23,5 +23,10 @@ public class WalletFreezeVo extends WalletFreezeEntity implements BaseUserInterf
 
     private String deptName;
 
+    /**
+     * 钱包相关
+     */
+    private Long walletTypeId;
+
     private String cardNumber;
 }

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/WalletManageVo.java

@@ -3,20 +3,23 @@ package com.bsd.pjcloud.wallet.api.vo;
 import com.bsd.pjcloud.admin.api.vo.base.BaseDeptInterface;
 import com.bsd.pjcloud.admin.api.vo.base.BaseUserInterface;
 import com.bsd.pjcloud.wallet.api.entity.WalletManageEntity;
+import com.bsd.pjcloud.wallet.api.vo.base.BaseWalletTypeInterface;
 import lombok.Data;
 
 
 @Data
-public class WalletManageVo extends WalletManageEntity implements BaseUserInterface, BaseDeptInterface {
+public class WalletManageVo extends WalletManageEntity implements BaseUserInterface, BaseDeptInterface, BaseWalletTypeInterface {
 
     /**
-     * 钱包类型名
+     * 钱包类型
      */
+    private Long walletTypeId;
+
     private String walletTypeName;
 
     private String walletTypeUniqueCode;
 
-    private String walletIcon;
+    private String walletTypeIcon;
 
     /**
      * 用户相关

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeApplyVo.java

@@ -3,14 +3,21 @@ package com.bsd.pjcloud.wallet.api.vo.recharge;
 import com.bsd.pjcloud.admin.api.vo.base.BaseDeptInterface;
 import com.bsd.pjcloud.admin.api.vo.base.BaseUserInterface;
 import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeApplyEntity;
+import com.bsd.pjcloud.wallet.api.vo.base.BaseWalletTypeInterface;
 import lombok.Data;
 
 @Data
-public class WalletRechargeApplyVo extends WalletRechargeApplyEntity implements BaseUserInterface, BaseDeptInterface {
+public class WalletRechargeApplyVo extends WalletRechargeApplyEntity implements BaseUserInterface, BaseDeptInterface, BaseWalletTypeInterface {
+    /**
+     * 钱包类型相关
+     */
+    private Long walletTypeId;
 
     private String walletTypeName;
 
-    private String uniqueCode;
+    private String walletTypeUniqueCode;
+
+    private String walletTypeIcon;
 
     /**
      * 用户相关