From 8444147f34b521cc53191bccf18663b67d5ba42c Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 28 Jun 2023 10:56:15 +0800 Subject: [PATCH 1/5] //bug --- .../callback/car/dahua/WxCarDaHuaCallBackController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/dahua/WxCarDaHuaCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/dahua/WxCarDaHuaCallBackController.java index 7333a99c4..127e8cf7b 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/dahua/WxCarDaHuaCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/dahua/WxCarDaHuaCallBackController.java @@ -38,7 +38,7 @@ import java.util.Map; @Slf4j @RestController -@RequestMapping("/keTuoCarCallback") +@RequestMapping("/daHuaCarCallback") public class WxCarDaHuaCallBackController extends WxParkCallBackBaseController { @Autowired From 391eb50540d87113cf9e4c1bc9e298365fe78a00 Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Wed, 28 Jun 2023 11:09:53 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8F=92=E5=85=A5=E5=8D=A1=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...wx_card_daily_log.sql => V2023062600001_wx_card_daily_log.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename mallinkAdmin/src/main/resources/db/migration/{V202306261648_wx_card_daily_log.sql => V2023062600001_wx_card_daily_log.sql} (100%) diff --git a/mallinkAdmin/src/main/resources/db/migration/V202306261648_wx_card_daily_log.sql b/mallinkAdmin/src/main/resources/db/migration/V2023062600001_wx_card_daily_log.sql similarity index 100% rename from mallinkAdmin/src/main/resources/db/migration/V202306261648_wx_card_daily_log.sql rename to mallinkAdmin/src/main/resources/db/migration/V2023062600001_wx_card_daily_log.sql From fec0fbf725072fc7f4b48b9409b6264faaa64ad2 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 28 Jun 2023 13:54:14 +0800 Subject: [PATCH 3/5] //test --- .../controller/market/WxOrderController.java | 27 ------------------- .../V2023061500001_wx_card_spend.sql | 20 -------------- .../V2023062600001_wx_card_daily_log.sql | 4 +++ .../V2023062800001_card_log_permission.sql | 10 +++++++ .../douyin/pay/ProfitSharingV2Service.java | 14 ---------- .../pay/impl/ProfitSharingV2ServiceImpl.java | 14 ---------- 6 files changed, 14 insertions(+), 75 deletions(-) delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V2023061500001_wx_card_spend.sql create mode 100644 mallinkAdmin/src/main/resources/db/migration/V2023062800001_card_log_permission.sql diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java index 3f7627d21..3f5bc6355 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java @@ -62,15 +62,6 @@ public class WxOrderController extends BaseController { @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; - @Autowired - private WxAppinfoService wxAppinfoService; - - @Autowired - private WxPayAccountService wxPayAccountService; - - @Autowired - private MaUtil maUtil; - @Autowired OrderFactory orderFactory; @@ -289,23 +280,5 @@ public class WxOrderController extends BaseController { } - @ApiOperation("") - @GetMapping("test") - @SystemControllerLog(description = "") - public ResultData test(Long composeOrderId) { - logger.debug("[" + getIpAddr() + "] WxOrderController::test"); - - WxAppinfo appInfo = wxAppinfoService.getCAppInfo(getTenantInfo(), EnumAppPlat.TOUTIAO); - WxPayAccount payAccount = wxPayAccountService.getById(appInfo.getPayId()); - TtPayService ttPayService = maUtil.getTtPayService(appInfo, payAccount); - List settleResultList = null; - try { - settleResultList = ttPayService.getProfitSharingV2Service().getOrderSettle(composeOrderId.toString()); - } catch (TtPayException e) { - e.printStackTrace(); - } - return new ResultData(settleResultList); - } - } diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023061500001_wx_card_spend.sql b/mallinkAdmin/src/main/resources/db/migration/V2023061500001_wx_card_spend.sql deleted file mode 100644 index c744e1776..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V2023061500001_wx_card_spend.sql +++ /dev/null @@ -1,20 +0,0 @@ -ALTER TABLE `mallink`.`wx_card_spend` -MODIFY COLUMN `remark` varchar(225) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注' AFTER `pos_order_id`; - - -CREATE TABLE `wx_card_set_price` ( - `id` bigint(20) NOT NULL COMMENT '主键ID', - `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', - `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID', - `card_password_id` bigint(20) NOT NULL COMMENT '卡密Id', - `ip` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'ip地址', - `price` int(10) DEFAULT NULL, - `create_date` datetime(0) NOT NULL COMMENT '创建时间', - `update_date` datetime(0) NOT NULL COMMENT '更新时间', - `operator_type` smallint(1) NOT NULL COMMENT '操作人类型', - `operator_id` bigint(20) DEFAULT NULL COMMENT '操作人', - `operator_user` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `idx`(`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023062600001_wx_card_daily_log.sql b/mallinkAdmin/src/main/resources/db/migration/V2023062600001_wx_card_daily_log.sql index bf94e5c8b..8b8c19ffe 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V2023062600001_wx_card_daily_log.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V2023062600001_wx_card_daily_log.sql @@ -1,3 +1,7 @@ +ALTER TABLE `mallink`.`wx_card_spend` +MODIFY COLUMN `remark` varchar(225) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注' AFTER `pos_order_id`; + + CREATE TABLE `wx_card_daily_log` ( `id` bigint(20) NOT NULL COMMENT '主键ID', diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023062800001_card_log_permission.sql b/mallinkAdmin/src/main/resources/db/migration/V2023062800001_card_log_permission.sql new file mode 100644 index 000000000..038a6b34b --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2023062800001_card_log_permission.sql @@ -0,0 +1,10 @@ +INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (653, '消费卡日志', 603, 'Y', NULL, 1, NULL, NULL, 'cardlog', NULL, 0, 653); + + +UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 210, 211, 212, 221, 222, 224, 225, 251, 261, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 431, 432, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 653, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 5502, 6610, 6611, 41701, 41702, 60701, 60702, 61201]' WHERE `id` = 1; +UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 4, 5, 6, 7, 8, 9, 10, 50, 101, 102, 103, 104, 105, 106, 107, 201, 202, 203, 204, 205, 209, 210, 211, 212, 221, 222, 224, 225, 251, 261, 409, 410, 411, 416, 418, 420, 421, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 653, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 961, 5502, 6610, 6611, 60701, 60702, 61201]' WHERE `id` = 2; +UPDATE `mallink`.`mall_sale_type` SET `menus` = '[2, 4, 5, 6, 7, 10, 50, 201, 202, 205, 210, 211, 212, 221, 222, 224, 225, 251, 261, 409, 410, 411, 416, 418, 502, 503, 504, 505, 506, 507, 508, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 621, 622, 623, 624, 625, 626, 641, 642, 643, 644, 645, 646, 651, 652, 653, 661, 662, 663, 664, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 5502, 60701, 60702, 61201]' WHERE `id` = 3; +UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 201, 202, 203, 204, 205, 206, 209, 210, 211, 212, 221, 222, 223, 224, 225, 251, 261, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 431, 432, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 615, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 647, 651, 652, 653, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 676, 680, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 5502, 6610, 6611, 41701, 41702, 60701, 60702, 61201, 61202, 61501, 61502]' WHERE `id` = 12; +UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 210, 211, 212, 221, 222, 224, 225, 251, 261, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 431, 432, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 653, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 5502, 6610, 6611, 41701, 41702, 60701, 60702, 61201]' WHERE `id` = 1028; +UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 210, 211, 212, 221, 222, 224, 225, 251, 261, 299, 300, 307, 308, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 431, 432, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 653, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 5502, 6610, 6611, 41701, 41702, 60701, 60702, 61201]' WHERE `id` = 1035001036; +UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 201, 202, 203, 204, 205, 206, 209, 210, 211, 212, 221, 222, 225, 223, 224, 251, 261, 299, 300, 307, 308, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 431, 432, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 615, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 647, 651, 652, 653, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 676, 680, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 5502, 6610, 6611, 41701, 41702, 60701, 60702, 61201, 61202, 61501, 61502]' WHERE `id` = 103500103610; diff --git a/mallinkService/src/main/java/com/iformall/douyin/pay/ProfitSharingV2Service.java b/mallinkService/src/main/java/com/iformall/douyin/pay/ProfitSharingV2Service.java index 0591059f5..b9f0d29e7 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/pay/ProfitSharingV2Service.java +++ b/mallinkService/src/main/java/com/iformall/douyin/pay/ProfitSharingV2Service.java @@ -48,19 +48,5 @@ public interface ProfitSharingV2Service { */ List getProfitSharingResult(String out_settle_no) throws TtPayException; - /** - *
-   * 查询分账接口
-   * out_order_no string 否 开发者交易订单id,长度<64byte,数字ASCII字符
-   * out_settle_no string 否 开发者分账单id,长度<64byte,数字、ASCII字符
-   * order_id string 否 抖音开平侧订单id,长度<64byte,数字、ASCII
-   * settle_id string 否 抖音开平侧分账单id,长度<64byte,数字、ASCII
-   * - 查询优先级: settle_id > order_id > out_settle_no > out_order_no,4个参数选填一个
-   *   - 例如:请求填写了settle_id和order_id,服务只会按settle_id来查询,忽略order_id
-   *   - 如果未查询到结果,会返回空数组
-   * - 注意:对于担保交易和交易1.0的订单,如果需要根据order_id/out_order_no查询订单的分账记录,建议使用order_id(抖音开平侧支付单id查询),若使用out_order_no可能存在查询不到的情况
-   *
-   */
-  List getOrderSettle(String out_order_no) throws TtPayException;
 
 }
diff --git a/mallinkService/src/main/java/com/iformall/douyin/pay/impl/ProfitSharingV2ServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/pay/impl/ProfitSharingV2ServiceImpl.java
index c6fe01b90..5bea2baff 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/pay/impl/ProfitSharingV2ServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/pay/impl/ProfitSharingV2ServiceImpl.java
@@ -59,20 +59,6 @@ public class ProfitSharingV2ServiceImpl implements ProfitSharingV2Service {
     }
   }
 
-  @Override
-  public List getOrderSettle(String out_order_no) throws TtPayException {
-    String url = String.format("%s/api/apps/trade/v2/query_settle", this.payService.getPayBaseUrl());
-    JsonObject jsonObject = new JsonObject();
-    jsonObject.addProperty("out_order_no",out_order_no);
-    String result = this.payService.postV2(url,jsonObject.toString());
-    ProfitSharingResult sharingResult = GSON.fromJson(result, ProfitSharingResult.class);
-    if(sharingResult.isSuccess()){
-      return sharingResult.getData();
-    }else{
-      throw new TtPayException(sharingResult.getErrTips());
-    }
-  }
-
 
   /**
    * 校验通知签名

From 27bd94cefbdc9185031d64050b4770618d4bc82b Mon Sep 17 00:00:00 2001
From: lrh <1585126058@qq.com>
Date: Wed, 28 Jun 2023 15:04:02 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8F=92=E5=85=A5=E5=8D=A1=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/WxCardDailyLogMapper.xml  | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/mallinkService/src/main/resources/mapper/WxCardDailyLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCardDailyLogMapper.xml
index 1e445319a..d43cab031 100644
--- a/mallinkService/src/main/resources/mapper/WxCardDailyLogMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCardDailyLogMapper.xml
@@ -14,11 +14,15 @@
         
         
         
+        
+        
+        
+        
     
 
     
 	    `id`,`tenant_id`,`parent_tenant_id`,`card_password_id`,`ip`,`create_date`,`update_date`,
-	    `price`,`operator_type`,`operator_id`,`operator_user`, `remark`
+	    `price`,`operator_type`,`operator_id`,`operator_user`, `remark`,`coupon_id`,`card_info_id`,`type`,`count`
 	
 
     
@@ -35,8 +39,14 @@
         
             and `card_password_id` = #{cardPasswordId}
         
-        
-            and `operator_type` = #{operatorType}
+        
+            and `coupon_id` = #{couponId}
+        
+        
+            and `card_info_id` = #{cardInfoId}
+        
+        
+            and `type` = #{type}
         
         
             and `operator_id` = #{operatorId}
@@ -56,7 +66,7 @@
     
 

From d54cd67c9bf2a6140d017aab1324f1eb10dab9a0 Mon Sep 17 00:00:00 2001
From: xhxu 
Date: Wed, 28 Jun 2023 15:24:14 +0800
Subject: [PATCH 5/5] //unsettle

---
 .../iformall/douyin/pay/DouYinPayHelper.java  | 39 ++++++++++---------
 .../pay/orderQuery/QueryUnsettleAmount.java   | 18 +++++++++
 2 files changed, 39 insertions(+), 18 deletions(-)
 create mode 100644 mallinkService/src/main/java/com/iformall/douyin/pay/orderQuery/QueryUnsettleAmount.java

diff --git a/mallinkService/src/main/java/com/iformall/douyin/pay/DouYinPayHelper.java b/mallinkService/src/main/java/com/iformall/douyin/pay/DouYinPayHelper.java
index 39de630c1..eeea7bec7 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/pay/DouYinPayHelper.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/pay/DouYinPayHelper.java
@@ -6,9 +6,7 @@ import java.security.NoSuchAlgorithmException;
 import java.util.*;
 
 import com.iformall.common.ErrorCode;
-import com.iformall.douyin.pay.orderQuery.QueryMerchantResult;
-import com.iformall.douyin.pay.orderQuery.QueryRefundResult;
-import com.iformall.douyin.pay.orderQuery.QuerySettleResult;
+import com.iformall.douyin.pay.orderQuery.*;
 import com.iformall.douyin.pay.preOrder.*;
 import com.iformall.enums.EnumPayStatus;
 import com.iformall.exception.MallinkException;
@@ -16,7 +14,6 @@ import com.iformall.utils.sign.SignUtils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.iformall.douyin.pay.orderQuery.OrderQueryResult;
 import com.iformall.utils.HttpUtil;
 
 import lombok.extern.slf4j.Slf4j;
@@ -352,8 +349,9 @@ public class DouYinPayHelper {
 		}
 	}
 
+	//可分账余额查询
 	//https://developer.toutiao.com/api/apps/ecpay/v1/unsettle_amount
-	public static void unsettleAmount(String appId,String salt,String outOrderId,String thirdParytyId) {
+	public static QueryUnsettleAmount unsettleAmount(String appId, String salt, String outOrderId, String thirdParytyId) {
 		Map map = new HashMap();
 		map.put("app_id",appId);
 		map.put("salt",salt);
@@ -363,19 +361,24 @@ public class DouYinPayHelper {
 		String response = doPost("https://developer.toutiao.com/api/apps/ecpay/v1/unsettle_amount", map);
 		log.info("查询待分账金额    request:"+map.toString()+"    response:"+response);
 		JSONObject jsonObject = JSON.parseObject(response);
-//		Integer code = jsonObject.getInteger("err_no");
-//		if (null != code && code.intValue() == 0 ) {
-//			JSONObject info = jsonObject.getJSONObject("settle_info");
-//			QuerySettleResult result = new QuerySettleResult();
-//			result.setSettleNo(info.getString("settle_no"));
-//			result.setSettleAmount(info.getInteger("settle_amount"));
-//			result.setSettleStatus(info.getString("settle_status"));
-//			result.setMsg(jsonObject.getString("err_tips"));
-//			return result;
-//		}else {
-//			log.error("settleQuery reponse error. request: "+JSON.toJSONString(map)+"   response:"+response);
-////			return null;
-//		}
+		Integer code = jsonObject.getInteger("err_no");
+		if (null != code && code.intValue() == 0 ) {
+			JSONObject data = jsonObject.getJSONObject("data");
+			QueryUnsettleAmount result = new QueryUnsettleAmount();
+			result.setOutOrderNo(data.getString("out_order_no"));
+			result.setUnsettleAmount(data.getInteger("unsettle_amount"));
+			JSONObject detail = data.getJSONObject("detail");
+			JSONObject payInfo = detail.getJSONObject("pay_info");
+			result.setOutPayNo(payInfo.getString("out_order_no"));
+			result.setAmount(payInfo.getInteger("amount"));
+			result.setPaymentRake(detail.getInteger("payment_rake"));
+			result.setLifeRake(detail.getInteger("life_rake"));
+			result.setCommission(detail.getInteger("commission"));
+			return result;
+		}else {
+			log.error("unsettleAmount reponse error. request: "+JSON.toJSONString(map)+"   response:"+response);
+			return null;
+		}
 	}
 
 	public static void main(String[] args) {
diff --git a/mallinkService/src/main/java/com/iformall/douyin/pay/orderQuery/QueryUnsettleAmount.java b/mallinkService/src/main/java/com/iformall/douyin/pay/orderQuery/QueryUnsettleAmount.java
new file mode 100644
index 000000000..207c764ae
--- /dev/null
+++ b/mallinkService/src/main/java/com/iformall/douyin/pay/orderQuery/QueryUnsettleAmount.java
@@ -0,0 +1,18 @@
+package com.iformall.douyin.pay.orderQuery;
+
+import lombok.Data;
+
+@Data
+public class QueryUnsettleAmount {
+
+	private String outOrderNo;//商户侧的订单号
+	private Integer unsettleAmount;//剩余待结算金额
+
+	private String outPayNo;//外部支付单单号
+	private Integer amount;//支付单总金额
+
+	private Integer paymentRake;//平台支付手续费金额,单位为分
+	private Integer lifeRake;//平台行业抽佣金额,单位为分
+	private Integer commission;//平台达人分佣金额,单位为分
+
+}