From cae36cab432f61229fe17ce9df66e51d342537a2 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Thu, 21 Dec 2023 15:28:42 +0800
Subject: [PATCH] update

---
 .../src/test/java/SpringBootTestController.java     | 13 ++++++-------
 .../com/jsowell/netty/server/mqtt/MqttSever.java    |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java
index 0e7626ed4..3058dfe4b 100644
--- a/jsowell-admin/src/test/java/SpringBootTestController.java
+++ b/jsowell-admin/src/test/java/SpringBootTestController.java
@@ -726,11 +726,11 @@ public class SpringBootTestController {
      */
     @Test
     public void test() {
-        String paymentId = "002212023102621451610563612286923030528";
+        String paymentId = "002212023111222070910569778388115099648";
         AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount();
-        adapayMemberAccount.setAdapayMemberId("0");
-        BigDecimal deductionAmount = new BigDecimal("23.78");
-        String orderCode = "C23610900688";
+        adapayMemberAccount.setAdapayMemberId("ACM25743626");
+        BigDecimal deductionAmount = new BigDecimal("14.28");
+        String orderCode = "C27669197498";
         // 延时分账，使用确认交易API
         PaymentConfirmResponse paymentConfirmResponse = adapayService.createPaymentConfirmRequest(paymentId,
                 adapayMemberAccount, deductionAmount, orderCode, wechatAppId1);
@@ -746,7 +746,7 @@ public class SpringBootTestController {
         // TODO 获取默认结算账户，如需分给对应商户就填写正确的汇付会员id
         // AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.getDefault();
         AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount();
-        adapayMemberAccount.setAdapayMemberId("ACM69460507");
+        adapayMemberAccount.setAdapayMemberId("ACM25743626");
         for (int i = 0; i < paymentList.size(); i++) {
             JSONObject jsonObject = (JSONObject) paymentList.get(i);
             BigDecimal confirmAmt = jsonObject.getBigDecimal("settleAmount"); // 确认金额就是结算金额
@@ -763,8 +763,7 @@ public class SpringBootTestController {
     // 需要重新分账的订单信息（针对未分账的订单）
     public JSONArray getPaymentList() {
         String jsonArrayString = "[" +
-                "{\"orderCode\":\"C42071068210\", \"settleAmount\":\"1.85\", \"paymentId\":\"002212023102519093110563210700862242816\"}" +
-                "{\"orderCode\":\"C48910624476\", \"settleAmount\":\"64.39\", \"paymentId\":\"002212023102523125710563271965594312704\"}" +
+                "{\"orderCode\":\"C27669197498\", \"settleAmount\":\"14.28\", \"paymentId\":\"002212023111222070910569778388115099648\"}" +
                 "]";
         return JSONArray.parseArray(jsonArrayString);
     }
diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/server/mqtt/MqttSever.java b/jsowell-netty/src/main/java/com/jsowell/netty/server/mqtt/MqttSever.java
index e379a5cec..97fd0b29c 100644
--- a/jsowell-netty/src/main/java/com/jsowell/netty/server/mqtt/MqttSever.java
+++ b/jsowell-netty/src/main/java/com/jsowell/netty/server/mqtt/MqttSever.java
@@ -26,7 +26,7 @@ public class MqttSever implements CommandLineRunner {
     @Override
     public void run(String... args) throws Exception {
         InetSocketAddress address = new InetSocketAddress(Constants.SOCKET_IP, 1883);
-        this.start(address);
+        // this.start(address);
     }
 
     public void start(InetSocketAddress address) {