From 4633d8dc805d8659507fd695902e4365defd359b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A3=E6=96=B0?= Date: Wed, 15 Apr 2026 10:03:11 +0000 Subject: [PATCH] Merge #100 into master from cc_0260415_fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat:提现刷新 * cc_0260415_fix: (1 commits squashed) - feat:提现刷新 Signed-off-by: 正新 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/100 --- .../com/cool/store/vo/order/WalletPayVO.java | 2 +- .../impl/WithdrawApplicationServiceImpl.java | 20 ++++++++++++++++--- .../webb/WithdrawApplicationController.java | 10 ++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/order/WalletPayVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/order/WalletPayVO.java index 93216b085..74bd0c082 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/order/WalletPayVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/order/WalletPayVO.java @@ -34,6 +34,6 @@ public class WalletPayVO { public String getPayType() { - return "平安钱包"; + return "网商钱包"; } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WithdrawApplicationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WithdrawApplicationServiceImpl.java index f8b27fb4f..e6f7b9b27 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WithdrawApplicationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WithdrawApplicationServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.cool.store.constants.RedisConstant; import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; +import com.cool.store.dao.EnterpriseUserDAO; import com.cool.store.dao.WithdrawApplicationDAO; import com.cool.store.dao.wallet.WalletTradeDAO; import com.cool.store.dto.wallet.AccountWithdrawerDTO; @@ -27,16 +28,17 @@ import com.cool.store.utils.RedisUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; import java.text.MessageFormat; -import java.util.Date; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; +import java.util.stream.Stream; import static com.cool.store.enums.wallet.WalletTradeModuleEnum.STANDARD_STORE; import static com.cool.store.enums.wallet.WalletTradeModuleEnum.TRANSFER; @@ -60,12 +62,24 @@ public class WithdrawApplicationServiceImpl implements WithdrawApplicationServic @Resource WalletTradeDAO walletTradeDAO; + @Resource + EnterpriseUserDAO enterpriseUserDAO; + private static final String WITHDRAW_ORDER_PREFIX = "TX"; @Override public PageInfo page(WithdrawApplicationPageRequest request) { PageHelper.startPage(request.getPageNum(), request.getPageSize()); List responses = withdrawApplicationDAO.pageQuery(request); + Set userIdList = responses.stream() + .filter(x -> StringUtils.isNotBlank(x.getCreateUserId())) + .flatMap(x -> Stream.of( x.getCreateUserId())) + .filter(StringUtils::isNotBlank) + .collect(Collectors.toSet()); + Map userNameMap = enterpriseUserDAO.getUserNameMap(new ArrayList<>(userIdList)); + responses.stream().forEach(x->{ + x.setCreateUserName(userNameMap.get(x.getCreateUserId())); + }); return new PageInfo<>(responses); } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/WithdrawApplicationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/WithdrawApplicationController.java index 71884299f..26737d086 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/WithdrawApplicationController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/WithdrawApplicationController.java @@ -1,6 +1,7 @@ package com.cool.store.controller.webb; import com.cool.store.dto.wallet.WithdrawApplicationDTO; +import com.cool.store.job.XxlJobHandler; import com.cool.store.request.WithdrawApplicationPageRequest; import com.cool.store.request.WithdrawApplicationRequest; import com.cool.store.response.ResponseResult; @@ -26,6 +27,8 @@ public class WithdrawApplicationController { @Resource private WithdrawApplicationService withdrawApplicationService; + @Resource + XxlJobHandler xxlJobHandler; @PostMapping("/add") @ApiOperation("新增提现申请") @@ -44,4 +47,11 @@ public class WithdrawApplicationController { public ResponseResult confirmWithdraw(@RequestParam Long id) { return ResponseResult.success(withdrawApplicationService.confirmWithdraw(id)); } + + @ApiOperation("刷新提现单状态") + @GetMapping("/refreshStatus") + public ResponseResult refreshStatus() { + xxlJobHandler.withdrawUpdate(); + return ResponseResult.success(Boolean.TRUE); + } }