diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java index 5ccfaf89a..c96d2d50d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java @@ -24,7 +24,9 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.ZipUtil; import com.jsowell.common.util.id.IdUtils; import com.jsowell.pile.domain.AdapayMemberAccount; +import com.jsowell.pile.domain.ClearingBillInfo; import com.jsowell.pile.domain.ClearingWithdrawInfo; +import com.jsowell.pile.service.ClearingBillInfoService; import com.jsowell.pile.service.ClearingWithdrawInfoService; import com.jsowell.pile.service.IAdapayMemberAccountService; import lombok.extern.slf4j.Slf4j; @@ -40,6 +42,7 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Slf4j @Service @@ -59,6 +62,9 @@ public class AdapayMemberService { @Autowired private ClearingWithdrawInfoService clearingWithdrawInfoService; + @Autowired + private ClearingBillInfoService clearingBillInfoService; + public void createSettleAccount(SettleAccountDTO dto) throws BaseAdaPayException, BusinessException { String bankAcctType = dto.getBankAcctType(); if (StringUtils.equals(bankAcctType, Constants.ONE)) { @@ -491,7 +497,10 @@ public class AdapayMemberService { clearingWithdrawInfoService.insertOrUpdate(record); // 修改清分账单为提现中 - + List list = clearingBillInfoService.selectByMerchantId(dto.getMerchantId()); + List clearingBillIds = list.stream().map(ClearingBillInfo::getId).collect(Collectors.toList()); + String billStatus = "3"; + clearingBillInfoService.updateStatus(clearingBillIds, billStatus); } /** 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 849561d36..57677c361 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 @@ -1,6 +1,9 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.ClearingBillInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; public interface ClearingBillInfoMapper { /** @@ -44,4 +47,8 @@ public interface ClearingBillInfoMapper { * @return update count */ int updateByPrimaryKey(ClearingBillInfo record); + + List selectByMerchantId(@Param("merchantId") String merchantId); + + void updateStatus(@Param("clearingBillIds") List clearingBillIds, @Param("billStatus") String billStatus); } \ 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 7085133d4..77a8839e1 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 @@ -1,6 +1,9 @@ package com.jsowell.pile.service; import com.jsowell.pile.domain.ClearingBillInfo; + +import java.util.List; + public interface ClearingBillInfoService{ @@ -16,4 +19,7 @@ public interface ClearingBillInfoService{ int updateByPrimaryKey(ClearingBillInfo record); + List selectByMerchantId(String merchantId); + + void updateStatus(List clearingBillIds, String billStatus); } 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 ce8147122..38905a8b2 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 @@ -1,10 +1,15 @@ package com.jsowell.pile.service.impl; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.ClearingBillInfo; import com.jsowell.pile.mapper.ClearingBillInfoMapper; import com.jsowell.pile.service.ClearingBillInfoService; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + @Service public class ClearingBillInfoServiceImpl implements ClearingBillInfoService{ @@ -41,4 +46,17 @@ public class ClearingBillInfoServiceImpl implements ClearingBillInfoService{ return clearingBillInfoMapper.updateByPrimaryKey(record); } + @Override + public List selectByMerchantId(String merchantId) { + return clearingBillInfoMapper.selectByMerchantId(merchantId); + } + + @Override + public void updateStatus(List clearingBillIds, String billStatus) { + if (CollectionUtils.isEmpty(clearingBillIds) || StringUtils.isBlank(billStatus)) { + return; + } + clearingBillInfoMapper.updateStatus(clearingBillIds, billStatus); + } + } diff --git a/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml index 7dffab1cf..1efdb7612 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml @@ -235,4 +235,21 @@ del_flag = #{delFlag,jdbcType=VARCHAR} where id = #{id,jdbcType=INTEGER} + + + + + update clearing_bill_info + set bill_status = #{billStatus,jdbcType=VARCHAR} + where id in + + #{item,jdbcType=INTEGER} + + \ No newline at end of file