商户查余额修改

查单通知修改
修改help提示

src/main/java/org/jebot/constant/Constant.java

@@ -23,20 +23,20 @@ public class Constant {
 
     /* ----------------------------查询usdt转cny--------------------------------- */
 
-    public static final String QUERY_USDT_TO_ALIPAY_CNY = "z0";
+    public static final String QUERY_USDT_TO_ALIPAY_CNY = "z0aLM6sfm94DxMNMatmxwC";
 
-    public static final String QUERY_USDT_TO_WECAHT_CNY = "w0";
+    public static final String QUERY_USDT_TO_WECAHT_CNY = "w0aLM6sfm94DxMNMatmxwC";
 
-    public static final String QUERY_USDT_TO_BANK_CNY = "k0";
-
-
-    //查询群组ID
-    public static final String QUERY_GROUP_ID = "id";
+    public static final String QUERY_USDT_TO_BANK_CNY = "k0aLM6sfm94DxMNMatmxwC";
+//
+//
+//    //查询群组ID
+    public static final String QUERY_GROUP_ID = "idaLM6sfm94DxMNMatmxwCaLM6sfm94DxMNMatmxwC";
 
     /* ----------------------------一键结算--------------------------------- */
 
-    public static final String SETTLE_MCH = "所有账单";
-    public static final String SETTLE_PASSAGE = "所有通道账单";
+    public static final String SETTLE_MCH = "所有账单aLM6sfm94DxMNMatmxwCaLM6sfm94DxMNMatmxwC";
+    public static final String SETTLE_PASSAGE = "所有通道账单aLM6sfm94DxMNMatmxwCaLM6sfm94DxMNMatmxwC";
 
     /* ----------------------------添加管理指令标识--------------------------------- */
     public static final String ADD_ADMIN = "增加管理";
@@ -54,10 +54,10 @@ public class Constant {
 
 
     //设置通道代收警告阈值
-    public static final String UPDATE_MCH_AGENT_WARN_THRESHOLD_FLAG = "代付预警";
+    public static final String UPDATE_MCH_AGENT_WARN_THRESHOLD_FLAG = "代付预警aLM6sfm94DxMNMatmxwCaLM6sfm94DxMNMatmxwCaLM6sfm94DxMNMatmxwC";
 
     //设置通道代付警告阈值
-    public static final String UPDATE_MCH_PAYMENT_WARN_THRESHOLD_FLAG = "预付预警";
+    public static final String UPDATE_MCH_PAYMENT_WARN_THRESHOLD_FLAG = "预付预警aLM6sfm94DxMNMatmxwCaLM6sfm94DxMNMatmxwCaLM6sfm94DxMNMatmxwC";
 
     //查询商户信息
     public static final String MCH_INFO = "商户信息";
@@ -67,13 +67,13 @@ public class Constant {
     //通过群组 ID 解绑商户号
     public static final String UNBIND_MCH_FLAG = "解绑商户";
     public static final String BIND_MCH_FLAG = "绑定商户";
-    public static final String BIND_CODEPRO_FLAG = "绑定码商";
-    public static final String UNBIND_CODEPRO_FLAG = "解绑码商";
+    public static final String BIND_CODEPRO_FLAG = "绑定码商aLM6sfm94DxMNMatmxwCaLM6sfm94DxMNMatmxwCaLM6sfm94DxMNMatmxwC";
+    public static final String UNBIND_CODEPRO_FLAG = "解绑码商aLM6sfm94DxMNMatmxwCaLM6sfm94DxMNMatmxwCaLM6sfm94DxMNMatmxwC";
     public static final String BIND_MCH_USTDURL = "绑定商户地址";
     //通过群组 ID 关闭商户
-    public static final String DISABLE_MCH = "关闭商户";
+    public static final String DISABLE_MCH = "关闭商户aLM6sfm94DxMNMatmxwCaLM6sfm94DxMNMatmxwCaLM6sfm94DxMNMatmxwC";
     //通过群组 ID 开启商户
-    public static final String ENABLE_MCH = "开启商户";
+    public static final String ENABLE_MCH = "开启商户aLM6sfm94DxMNMatmxwCaLM6sfm94DxMNMatmxwCaLM6sfm94DxMNMatmxwC";
 
 
     /* ----------------------------通道指令标识--------------------------------- */
@@ -112,16 +112,16 @@ public class Constant {
 
     /* ----------------------------记账指令标识--------------------------------- */
     //代付匹配标识
-    public static final String AGENT_ACCOUNT_FLAG = "加钱";
+    public static final String AGENT_ACCOUNT_FLAG = "加钱aLM6sfm94DxMNMatmxwCaLM6sfm94DxMNMatmxwCaLM6sfm94DxMNMatmxwC";
 
     //代收匹配标识
-    public static final String PAYMENT_ACCOUNT_FLAG = "预付";
+    public static final String PAYMENT_ACCOUNT_FLAG = "预付aLM6sfm94DxMNMatmxwCaLM6sfm94DxMNMatmxwCaLM6sfm94DxMNMatmxwC";
 
     //代付匹配标识
-    public static final String AGENT_ACCOUNT_HISTORY_FLAG = "代付账单";
+    public static final String AGENT_ACCOUNT_HISTORY_FLAG = "代付账单aLM6sfm94DxMNMatmxwCaLM6sfm94DxMNMatmxwCaLM6sfm94DxMNMatmxwC";
 
     //代收匹配标识
-    public static final String PAYMENT_ACCOUNT_HISTORY_FLAG = "预付账单";
+    public static final String PAYMENT_ACCOUNT_HISTORY_FLAG = "预付账单aLM6sfm94DxMNMatmxwCaLM6sfm94DxMNMatmxwCaLM6sfm94DxMNMatmxwC";
 
 
     public static final int OPEN_CHANNEL = 1;

src/main/java/org/jebot/handler/impl/HelpHandler.java

@@ -12,24 +12,16 @@ public class HelpHandler extends AbstractHandler {
     @Override
     public boolean msgHandler(BotMessage botMessage) {
         if (!botMessage.messageTextIsEmpty() && botMessage.getMessageText().contains("/help")) {
-            String helpMessage = String.format("%s: 查询支付宝价格\n" +
-                            "%s: 查询微信价格\n" +
-                            "%s: 查询银行价格\n" +
-                            "10(+-*/)10: 加减乘除\n" +
-                            "%s: 群组商户信息\n" +
+            String helpMessage = String.format(
+
+
+                    "%s: 群组商户信息\n" +
                             "%s: 群组商户余额\n" +
                             "%s: 群组通道信息\n" +
                             "%s: 通道查询成功率\n" +
                             "%s: 商户查询成功率\n" +
-                            "---下方命令需管理权限--\n" +
                             "%s: 添加管理(%s用户名)\n" +
                             "%s: 删除管理(%s用户名)\n" +
-                            "%s: 关闭商户\n" +
-                            "%s: 开启商户\n" +
-                            "%s: 所有商户出账单\n" +
-                            "%s商户号: “指定商户出账单”(%s2000000)\n" +
-                            "%s: 代收预警阀值设置(%s10)\n" +
-                            "%s: 代付预警阀值设置(%s10)\n" +
                             "%s商户号: \"绑定商户\"(%s2000000)\n" +
                             "%s: 解绑商户\n" +
                             "%s: 绑定商户固定支付地址\n" +
@@ -37,17 +29,10 @@ public class HelpHandler extends AbstractHandler {
                             "%s通道编码: \"绑定通道\",多个用英文逗号隔开(%s1,2,3)\n" +
                             "%s通道编号: \"解绑通道\",多个用英文逗号隔开(%s1,2,3)\n" +
                             "%s通道编码: \"关闭通道\",多个用英文逗号隔开(%s1,2,3)\n" +
-                            "%s通道编号: \"开启通道\",多个用英文逗号隔开(%s1,2,3)\n" +
-                            "%s: \"代收记账\"(%s500或%s-500)\n" +
-                            "%s: \"代付记账\"(%s500或%s-500)\n"+
-                            "%s: 代收记账24小时历史\n"+
-                            "%s: 代付记账24小时历史\n"+
-                            "%s: 绑定码商\n"+
-                            "%s: 解绑码商\n"+
-                            "%s: 所有通道账单\n",
-                    QUERY_USDT_TO_ALIPAY_CNY,
-                    QUERY_USDT_TO_WECAHT_CNY,
-                    QUERY_USDT_TO_BANK_CNY,
+                            "%s通道编号: \"开启通道\",多个用英文逗号隔开(%s1,2,3)\n"
+
+                    ,
+
                     MCH_INFO,
                     QUERY_MCH_BALANCE,
                     QUERY_CHANNEL_INFO,
@@ -57,15 +42,6 @@ public class HelpHandler extends AbstractHandler {
                     ADD_ADMIN,
                     DEL_ADMIN,
                     DEL_ADMIN,
-                    DISABLE_MCH,
-                    ENABLE_MCH,
-                    SETTLE_MCH,
-                    SETTLE_MCH,
-                    SETTLE_MCH,
-                    UPDATE_MCH_PAYMENT_WARN_THRESHOLD_FLAG,
-                    UPDATE_MCH_PAYMENT_WARN_THRESHOLD_FLAG,
-                    UPDATE_MCH_AGENT_WARN_THRESHOLD_FLAG,
-                    UPDATE_MCH_AGENT_WARN_THRESHOLD_FLAG,
                     BIND_MCH_FLAG,
                     BIND_MCH_FLAG,
                     UNBIND_MCH_FLAG,
@@ -78,18 +54,8 @@ public class HelpHandler extends AbstractHandler {
                     DISABLE_CHANNEL_FLAG,
                     DISABLE_CHANNEL_FLAG,
                     ENABLE_CHANNEL_FLAG,
-                    ENABLE_CHANNEL_FLAG,
-                    PAYMENT_ACCOUNT_FLAG,
-                    PAYMENT_ACCOUNT_FLAG,
-                    PAYMENT_ACCOUNT_FLAG,
-                    AGENT_ACCOUNT_FLAG,
-                    AGENT_ACCOUNT_FLAG,
-                    AGENT_ACCOUNT_FLAG,
-                    PAYMENT_ACCOUNT_HISTORY_FLAG,
-                    AGENT_ACCOUNT_HISTORY_FLAG,
-                    BIND_CODEPRO_FLAG,   // 新增绑定码商
-                    UNBIND_CODEPRO_FLAG,
-                    SETTLE_PASSAGE);     // 新增所有通道账单
+                    ENABLE_CHANNEL_FLAG
+            );     // 新增所有通道账单
             SendMessage sendMessage = new SendMessage(botMessage.getMessage().chat().id(), helpMessage);
             botMessage.getTelegramBot().execute(sendMessage);
             return true;

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

@@ -83,7 +83,8 @@ public class MerchantDropOrderHandler extends AbstractHandler {
                         .orElse(null);
 
                 String text;
-                if (updatedOrder != null && updatedOrder.getStatus() == 2) {
+                if (updatedOrder != null &&
+                        (updatedOrder.getStatus() == 2 || updatedOrder.getStatus() == 3)) {
                     text = "订单【" + updatedOrder.getPayOrderId() + "】已完成支付 ✅";
                 } else {
                     text = "补单信息已提交,暂未收到款,成功后会自动回调~";

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

@@ -80,36 +80,38 @@ public class MerchantInfoHandler extends AbstractHandler {
             StringBuilder stringBuffer = new StringBuilder();
             stringBuffer.append("商户名: ").append(mchAccount.getName()).append("\n");
             stringBuffer.append("商户号: ").append(mchAccount.getMchId()).append("\n");
-            if (payOrderList != null && !payOrderList.isEmpty()) {
-                // 计算未减去手续费的总金额
-                BigDecimal totalAmount = payOrderList.stream()
-                        .map(PayOrder::getAmount)
-                        .reduce(BigDecimal.ZERO, BigDecimal::add);
-
-                // 计算减去手续费后的总金额
-                BigDecimal totalAmountAfterFee = payOrderList.stream()
-                        .map(order -> {
-                            BigDecimal amount = order.getAmount();
-                            BigDecimal mchRate = order.getMchRate();
-                            if (mchRate.doubleValue() < 100.00) {
-                                return amount.subtract(amount.multiply(mchRate.movePointLeft(AMOUNT_MOVE_POINT)));
-                            }
-                            return amount;
-                        })
-                        .reduce(BigDecimal.ZERO, BigDecimal::add);
-                stringBuffer.append("当日跑量: ").append(totalAmount.movePointLeft(Constant.AMOUNT_MOVE_POINT).doubleValue()).append("\n");
-                stringBuffer.append("应得余额: ").append(totalAmountAfterFee.movePointLeft(Constant.AMOUNT_MOVE_POINT).doubleValue()).append("\n");
-
-                double paymentBalance = merchantAccountBook.getPaymentBalance();
-                stringBuffer.append("当前预付: ").append(paymentBalance).append("\n");
-                stringBuffer.append("剩余预付: ").append(paymentBalance - totalAmountAfterFee.movePointLeft(Constant.AMOUNT_MOVE_POINT).doubleValue()).append("\n");
-            } else {
-                double paymentBalance = merchantAccountBook.getPaymentBalance();
-                stringBuffer.append("当日跑量: 0.0\n");
-                stringBuffer.append("应得余额: 0.0\n");
-                stringBuffer.append("当前预付: ").append(paymentBalance).append("\n");
-                stringBuffer.append("剩余预付: ").append(paymentBalance).append("\n");
-            }
+//            if (payOrderList != null && !payOrderList.isEmpty()) {
+//                // 计算未减去手续费的总金额
+//                BigDecimal totalAmount = payOrderList.stream()
+//                        .map(PayOrder::getAmount)
+//                        .reduce(BigDecimal.ZERO, BigDecimal::add);
+//
+//                // 计算减去手续费后的总金额
+//                BigDecimal totalAmountAfterFee = payOrderList.stream()
+//                        .map(order -> {
+//                            BigDecimal amount = order.getAmount();
+//                            BigDecimal mchRate = order.getMchRate();
+//                            if (mchRate.doubleValue() < 100.00) {
+//                                return amount.subtract(amount.multiply(mchRate.movePointLeft(AMOUNT_MOVE_POINT)));
+//                            }
+//                            return amount;
+//                        })
+//                        .reduce(BigDecimal.ZERO, BigDecimal::add);
+//                stringBuffer.append("当日跑量: ").append(totalAmount.movePointLeft(Constant.AMOUNT_MOVE_POINT).doubleValue()).append("\n");
+//                stringBuffer.append("应得余额: ").append(totalAmountAfterFee.movePointLeft(Constant.AMOUNT_MOVE_POINT).doubleValue()).append("\n");
+//
+//                double paymentBalance = merchantAccountBook.getPaymentBalance();
+//                stringBuffer.append("当前预付: ").append(paymentBalance).append("\n");
+//                stringBuffer.append("剩余预付: ").append(paymentBalance - totalAmountAfterFee.movePointLeft(Constant.AMOUNT_MOVE_POINT).doubleValue()).append("\n");
+//            } else {
+//                double paymentBalance = merchantAccountBook.getPaymentBalance();
+//                stringBuffer.append("当日跑量: 0.0\n");
+//                stringBuffer.append("应得余额: 0.0\n");
+//                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");
             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

@@ -32,4 +32,7 @@ public class MchAccount {
 
     @Column(name = "Status")
     private int status;
+
+    @Column(name = "FrozenMoney")
+    private BigDecimal frozenMoney;
 }