diff --git a/service/trade-service-source/trade-service-source-core/src/main/resources/application.yml b/service/trade-service-source/trade-service-source-core/src/main/resources/application.yml index 768eba6..7e0b2c4 100644 --- a/service/trade-service-source/trade-service-source-core/src/main/resources/application.yml +++ b/service/trade-service-source/trade-service-source-core/src/main/resources/application.yml @@ -3,7 +3,7 @@ server: spring: profiles: - active: dev + active: prod servlet: multipart: max-file-size: 200MB #单个文件上传大小 @@ -23,7 +23,7 @@ hchbox: sub-tables: 5 # 配置日志 logging: - config: classpath:logback.xml + config: classpath:logback-spring.xml # 必须配置 feign: diff --git a/service/trade-service-source/trade-service-source-core/src/main/resources/logback.xml b/service/trade-service-source/trade-service-source-core/src/main/resources/logback-spring.xml similarity index 100% rename from service/trade-service-source/trade-service-source-core/src/main/resources/logback.xml rename to service/trade-service-source/trade-service-source-core/src/main/resources/logback-spring.xml diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TopTradeServiceImpl.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TopTradeServiceImpl.java index c09e7a1..ccaa268 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TopTradeServiceImpl.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TopTradeServiceImpl.java @@ -30,7 +30,6 @@ import com.hchbox.repository.master.TaskMessageInfoRepository; import com.hchbox.repository.master.TopOrderRegistry; import com.hchbox.repository.master.TopTradeRepository; import com.hchbox.service.*; -import com.hchbox.task.SyncTask; import com.hchbox.uitl.RemindTemplates; import com.hchbox.util.*; import com.hchbox.vo.PageVo; @@ -46,7 +45,6 @@ import com.taobao.api.request.TradesSoldGetRequest; import com.taobao.api.response.TopOaidDecryptResponse; import com.taobao.api.response.TradeFullinfoGetResponse; import lombok.RequiredArgsConstructor; -import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; 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 c1c926b..2ddd60c 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 @@ -77,13 +77,7 @@ public class AccountTask { List sellerAccounts = sellerAccountRepository.findAllByParentId((long) DefaultNumberConstants.ZERO_NUMBER); for (SellerAccount account : sellerAccounts) { - // TODO 数据量过大情况 查询top表 Integer countNum = topTradeService.numberQueriesBySellerNick(account.getNickname()); - if (account.getId().equals(DefaultNumberConstants.COLORFUL_PUZZLE_NUMBER)) { - countNum = jdpTradeService.numberQueriesBySellerNick(account.getNickname(), - DateUtil.parse(TimeConstants.COLORFUL_PUZZLE_DATE)); - } - if (countNum > DefaultNumberConstants.ZERO_NUMBER) { sellerAccountService.updateMessageCount(account.getId(), countNum); if (account.getMassNum() != null @@ -91,12 +85,13 @@ public class AccountTask { && countNum > account.getMassNum()) { // 删除数据推送 taoBaoRdsPushService.deletePushUser(account.getNickname()); - // 修改账号状态 - sellerAccountService.updateAccountStatusAndExpiration - (account.getId(), DefaultNumberConstants.MINUS_ONE_NUMBER, DateUtil.date()); + if (account.getStatus() != DefaultNumberConstants.MINUS_ONE_NUMBER){ + // 修改账号状态 + sellerAccountService.updateAccountStatusAndExpiration + (account.getId(), DefaultNumberConstants.MINUS_ONE_NUMBER, DateUtil.date()); + } } } } } - }