diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 80cd86944..9a3d43b32 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -126,6 +126,9 @@ public class OrderService { @Resource private IMemberWalletLogService memberWalletLogService; + @Resource + private ClearingBillInfoService clearingBillInfoService; + @Resource private RedisCache redisCache; @@ -1176,9 +1179,20 @@ public class OrderService { String withdrawCode = jsonObject.getString("id"); // 通过取现id查询取现数据 ClearingWithdrawInfo clearingWithdrawInfo = clearingWithdrawInfoService.selectByWithdrawCode(withdrawCode); - clearingWithdrawInfo.setWithdrawStatus(Constants.ONE); - clearingWithdrawInfo.setUpdateTime(DateUtils.getNowDate()); - clearingWithdrawInfoService.updateByPrimaryKeySelective(clearingWithdrawInfo); + if (clearingWithdrawInfo != null) { + clearingWithdrawInfo.setWithdrawStatus(Constants.ONE); + clearingWithdrawInfo.setUpdateTime(DateUtils.getNowDate()); + clearingWithdrawInfoService.updateByPrimaryKeySelective(clearingWithdrawInfo); + } + + // 清分账单数据更新 + List clearingBillInfos = clearingBillInfoService.selectByWithdrawCode(withdrawCode); + if (CollectionUtils.isNotEmpty(clearingBillInfos)) { + for (ClearingBillInfo clearingBillInfo : clearingBillInfos) { + clearingBillInfo.setBillStatus("4"); + } + clearingBillInfoService.updateBatchSelective(clearingBillInfos); + } } /** diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java index 910db69d4..ba6172d8d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java @@ -728,7 +728,7 @@ public class AdapayService { List list = clearingBillInfoService.selectByMerchantId(dto.getMerchantId(), "2"); List clearingBillIds = list.stream().map(ClearingBillInfo::getId).collect(Collectors.toList()); String billStatus = "3"; - clearingBillInfoService.updateStatus(clearingBillIds, billStatus); + clearingBillInfoService.updateStatus(clearingBillIds, billStatus, id); } /** diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ClearingBillInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ClearingBillInfoMapper.java index 362ed1eef..a4263cdd9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ClearingBillInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ClearingBillInfoMapper.java @@ -68,7 +68,7 @@ public interface ClearingBillInfoMapper { List selectByMerchantId(@Param("merchantId") String merchantId, @Param("billStatus") String billStatus, @Param("tradeDate") String tradeDate); - void updateStatus(@Param("clearingBillIds") List clearingBillIds, @Param("billStatus") String billStatus); + void updateStatus(@Param("clearingBillIds") List clearingBillIds, @Param("billStatus") String billStatus, @Param("withdrawCode") String withdrawCode); /** * 后管用 查询运营商账单列表 @@ -77,4 +77,6 @@ public interface ClearingBillInfoMapper { * @return */ List getMerchantClearingBillList(GetClearingBillDTO dto); + + List selectByWithdrawCode(@Param("withdrawCode") String withdrawCode); } \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/ClearingBillInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/ClearingBillInfoService.java index e5b2583c9..323843819 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/ClearingBillInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/ClearingBillInfoService.java @@ -23,7 +23,7 @@ public interface ClearingBillInfoService { List selectByMerchantId(String merchantId, String billStatus); - void updateStatus(List clearingBillIds, String billStatus); + void updateStatus(List clearingBillIds, String billStatus, String withdrawCode); /** * 后管用 查询运营商账单列表 @@ -44,5 +44,7 @@ public interface ClearingBillInfoService { int batchInsert(List list); ClearingBillInfo selectByMerchantIdAndTradeDate(String merchantId, String tradeDate); + + List selectByWithdrawCode(String withdrawCode); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingBillInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingBillInfoServiceImpl.java index 764be5cd2..b6f479e64 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingBillInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingBillInfoServiceImpl.java @@ -58,11 +58,11 @@ public class ClearingBillInfoServiceImpl implements ClearingBillInfoService { } @Override - public void updateStatus(List clearingBillIds, String billStatus) { + public void updateStatus(List clearingBillIds, String billStatus, String withdrawCode) { if (CollectionUtils.isEmpty(clearingBillIds) || StringUtils.isBlank(billStatus)) { return; } - clearingBillInfoMapper.updateStatus(clearingBillIds, billStatus); + clearingBillInfoMapper.updateStatus(clearingBillIds, billStatus, withdrawCode); } /** @@ -126,5 +126,10 @@ public class ClearingBillInfoServiceImpl implements ClearingBillInfoService { } return result; } + + @Override + public List selectByWithdrawCode(String withdrawCode) { + return clearingBillInfoMapper.selectByWithdrawCode(withdrawCode); + } } diff --git a/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml index 744e62530..2ff38f6b2 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml @@ -754,7 +754,7 @@ update clearing_bill_info - set bill_status = #{billStatus,jdbcType=VARCHAR} + set bill_status = #{billStatus,jdbcType=VARCHAR}, withdraw_code = #{withdrawCode,jdbcType=VARCHAR} where id in #{item,jdbcType=INTEGER} @@ -782,4 +782,12 @@ order by t1.trade_date desc + + \ No newline at end of file