商户查余额修改

src/main/java/org/jebot/handler/impl/merchant/MerchantInfoHandler.java

@@ -14,6 +14,7 @@ import org.jebot.models.xxpay.PayOrder;
 import org.jebot.repository.xxpay.MchAccountRepository;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Date;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -110,8 +111,12 @@ public class MerchantInfoHandler extends AbstractHandler {
 //                stringBuffer.append("当前预付: ").append(paymentBalance).append("\n");
 //                stringBuffer.append("剩余预付: ").append(paymentBalance).append("\n");
 //            }
-            stringBuffer.append("商户余额: ").append(mchAccount.getBalance().movePointLeft(AMOUNT_MOVE_POINT)).append("\n");
-            stringBuffer.append("冻结余额: ").append(mchAccount.getFrozenMoney().movePointLeft(AMOUNT_MOVE_POINT)).append("\n");
+            BigDecimal available = mchAccount.getBalance()
+                    .subtract(mchAccount.getUnBalance())
+                    .movePointLeft(AMOUNT_MOVE_POINT)
+                    .setScale(2, RoundingMode.HALF_UP);
+            stringBuffer.append("商户余额: ").append(available).append("\n");
+            stringBuffer.append("冻结余额: ").append(mchAccount.getUnBalance().movePointLeft(AMOUNT_MOVE_POINT)).append("\n");
             stringBuffer.append("统计时间: ").append(DateUtil.formatDateTime(endDate));
             botMessage.getTelegramBot().execute(new SendMessage(botMessage.getMessage().chat().id(), stringBuffer.toString()));
             return true;

src/main/java/org/jebot/models/xxpay/MchAccount.java

@@ -33,6 +33,6 @@ public class MchAccount {
     @Column(name = "Status")
     private int status;
 
-    @Column(name = "FrozenMoney")
-    private BigDecimal frozenMoney;
+    @Column(name = "UnBalance")
+    private BigDecimal unBalance;
 }