Browse Source

钱包总览信息增加回显字段

xucaiqin 2 năm trước cách đây
mục cha
commit
54041d4fea

+ 10 - 0
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/WalletOverview.java

@@ -29,6 +29,16 @@ public class WalletOverview implements Serializable {
      */
     @JSONField(name = "ap_money")
     private Long apMoney;
+    /**
+     * 提现中金额
+     */
+    @JSONField(name = "wding_money")
+    private Long wdingMoney;
+    /**
+     * 充值中金额
+     */
+    @JSONField(name = "charging_money")
+    private Long chargingMoney;
     /**
      * 提现余额
      */

+ 1 - 1
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/WalletDetail.java

@@ -8,5 +8,5 @@ import java.util.List;
  * @author xucaiqin
  * @date 2023-08-28 15:43:49
  */
-public record WalletDetail(String entName, String money, String moneyYuan, int channel, List<String> channels) {
+public record WalletDetail(String entName, String money, String chargingMoney,String wdingMoney ,int channel, List<String> channels) {
 }

+ 2 - 2
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/WalletService.java

@@ -200,9 +200,9 @@ public class WalletService {
         R<WalletOverview> wallet = payCenterService.general(relation);
         if (wallet.getStatus()) {
             WalletOverview data = wallet.getData();
-            return new WalletDetail(LoginUserHolder.getEntName(), String.valueOf(data.getTotalMoney()), String.valueOf(data.getTotalMoney() / 100D), data.getChannelTotal(), data.getChannels());
+            return new WalletDetail(LoginUserHolder.getEntName(), String.valueOf(data.getTotalMoney() / 100D), String.valueOf(data.getChargingMoney()), String.valueOf(data.getWdingMoney()), data.getChannelTotal(), data.getChannels());
         }
-        return new WalletDetail(LoginUserHolder.getEntName(), "-", "-", 0, new ArrayList<>());
+        return new WalletDetail(LoginUserHolder.getEntName(), "-", "-", "-", 0, new ArrayList<>());
     }
 
     /**