From 304ba6b2e1b4d8719971f2d4ce757ad829d600bf Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Tue, 8 Aug 2023 10:32:30 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=8F=90=E7=8E=B0=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsowell/adapay/service/AdapayMemberService.java  | 4 ++--
 .../java/com/jsowell/pile/mapper/ClearingBillInfoMapper.java  | 2 +-
 .../com/jsowell/pile/service/ClearingBillInfoService.java     | 2 +-
 .../pile/service/impl/ClearingBillInfoServiceImpl.java        | 4 ++--
 .../src/main/resources/mapper/pile/ClearingBillInfoMapper.xml | 3 +++
 5 files changed, 9 insertions(+), 6 deletions(-)

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 e7aa319dc..ca96d84ae 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
@@ -462,7 +462,7 @@ public class AdapayMemberService {
         BigDecimal cashAmt = adapayAccountBalanceVO.getAvlBalance().subtract(feeAmt);
 
         // 可提现金额减去手续费后需大于0
-        if (cashAmt.compareTo(BigDecimal.ZERO) < 0) {
+        if (cashAmt.compareTo(BigDecimal.ZERO) <= 0) {
             throw new BusinessException(ReturnCodeEnum.CODE_INSUFFICIENT_BALANCE_ERROR);
         }
 
@@ -499,7 +499,7 @@ public class AdapayMemberService {
         clearingWithdrawInfoService.insertOrUpdate(record);
 
         // 修改清分账单为提现中
-        List<ClearingBillInfo> list = clearingBillInfoService.selectByMerchantId(dto.getMerchantId());
+        List<ClearingBillInfo> list = clearingBillInfoService.selectByMerchantId(dto.getMerchantId(), "2");
         List<Integer> 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 57677c361..70d480f81 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
@@ -48,7 +48,7 @@ public interface ClearingBillInfoMapper {
      */
     int updateByPrimaryKey(ClearingBillInfo record);
 
-    List<ClearingBillInfo> selectByMerchantId(@Param("merchantId") String merchantId);
+    List<ClearingBillInfo> selectByMerchantId(@Param("merchantId") String merchantId, @Param("billStatus") String billStatus);
 
     void updateStatus(@Param("clearingBillIds") List<Integer> 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 77a8839e1..e2b5ed225 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
@@ -19,7 +19,7 @@ public interface ClearingBillInfoService{
 
     int updateByPrimaryKey(ClearingBillInfo record);
 
-    List<ClearingBillInfo> selectByMerchantId(String merchantId);
+    List<ClearingBillInfo> selectByMerchantId(String merchantId, String billStatus);
 
     void updateStatus(List<Integer> 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 38905a8b2..377ce9d0f 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
@@ -47,8 +47,8 @@ public class ClearingBillInfoServiceImpl implements ClearingBillInfoService{
     }
 
     @Override
-    public List<ClearingBillInfo> selectByMerchantId(String merchantId) {
-        return clearingBillInfoMapper.selectByMerchantId(merchantId);
+    public List<ClearingBillInfo> selectByMerchantId(String merchantId, String billStatus) {
+        return clearingBillInfoMapper.selectByMerchantId(merchantId, billStatus);
     }
 
     @Override
diff --git a/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml
index 1efdb7612..646969656 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml
@@ -242,6 +242,9 @@
     from clearing_bill_info
     where del_flag = '0'
     and merchant_id = #{merchantId,jdbcType=VARCHAR}
+    <if test="billStatus != null and billStatus != ''">
+      and bill_status = #{billStatus,jdbcType=VARCHAR}
+    </if>
   </select>
 
   <update id="updateStatus">