From 4ff942eae490816fb152ed8c5a6c59dee3918e6e Mon Sep 17 00:00:00 2001 From: bynt Date: Wed, 1 Dec 2021 09:47:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=BB=98=E8=AE=A4=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=95=B0=E6=8D=AE=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hchbox/controller/SellerAccountController.java | 5 ++++- .../src/test/java/com/hchbox/MessageTest.java | 2 +- .../src/test/java/com/hchbox/SlaverTest.java | 2 +- .../main/java/com/hchbox/hander/TradeBuyerPayHandler.java | 2 -- .../src/main/java/com/hchbox/task/AccountTask.java | 1 + 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/SellerAccountController.java b/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/SellerAccountController.java index 02b1bf7..4adb1d7 100644 --- a/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/SellerAccountController.java +++ b/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/SellerAccountController.java @@ -19,6 +19,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.data.web.PageableDefault; import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -92,7 +94,8 @@ public class SellerAccountController { @GetMapping("/parentAccounts") @ApiOperation("分页查询主账号") - public CommonResult> getParentAccount(@RequestParam("sellerNick") String sellerNick, Pageable pageable) { + public CommonResult> getParentAccount(@RequestParam("sellerNick") String sellerNick, + @PageableDefault(sort = {"createTime"}, direction = Sort.Direction.DESC) Pageable pageable) { log.info("sellerNick=={}", sellerNick); return sellerAccountService.getParentAccount(sellerNick, pageable); } diff --git a/service/trade-service-source/trade-service-source-core/src/test/java/com/hchbox/MessageTest.java b/service/trade-service-source/trade-service-source-core/src/test/java/com/hchbox/MessageTest.java index 3b207ce..656631c 100644 --- a/service/trade-service-source/trade-service-source-core/src/test/java/com/hchbox/MessageTest.java +++ b/service/trade-service-source/trade-service-source-core/src/test/java/com/hchbox/MessageTest.java @@ -39,6 +39,6 @@ public class MessageTest { @Test public void updateMember(){ - memberService.updateMemberBySellerNick("陶娟娟1983", "卡布奇诺3304"); + } } diff --git a/service/trade-service-source/trade-service-source-core/src/test/java/com/hchbox/SlaverTest.java b/service/trade-service-source/trade-service-source-core/src/test/java/com/hchbox/SlaverTest.java index a2e2dd4..fe5a9a2 100644 --- a/service/trade-service-source/trade-service-source-core/src/test/java/com/hchbox/SlaverTest.java +++ b/service/trade-service-source/trade-service-source-core/src/test/java/com/hchbox/SlaverTest.java @@ -156,7 +156,7 @@ public class SlaverTest { @Test public void delete() { - List subAccountBySellerNick = sellerAccountService.findSubAccountBySellerNick(12482L); + sellerAccountService.queryAccountByParentId(12360L); } @Test diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/hander/TradeBuyerPayHandler.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/hander/TradeBuyerPayHandler.java index 6817031..0bdd805 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/hander/TradeBuyerPayHandler.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/hander/TradeBuyerPayHandler.java @@ -2,8 +2,6 @@ package com.hchbox.hander; import com.hchbox.annotaion.RedisLock; import com.hchbox.enums.AppSettingTypeEnum; -import com.hchbox.hander.TaoBaoHandler; -import com.hchbox.hander.message.TaoBaoMessage; import com.hchbox.hander.message.TaoBaoTradeMessage; import com.hchbox.service.TopTradeService; import lombok.RequiredArgsConstructor; diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/task/AccountTask.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/task/AccountTask.java index 074fa13..eabe10b 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/task/AccountTask.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/task/AccountTask.java @@ -73,6 +73,7 @@ public class AccountTask { List sellerAccounts = sellerAccountRepository.findAllByParentId((long) DefaultNumberConstants.ZERO_NUMBER); for (SellerAccount account : sellerAccounts) { + // TODO 数据量过大情况 查询top表 Integer countNum = jdpTradeService.numberQueriesBySellerNick(account.getNickname()); if (account.getId().equals(DefaultNumberConstants.COLORFUL_PUZZLE_NUMBER)) { countNum = jdpTradeService.numberQueriesBySellerNick(account.getNickname(),