修复提现状态bug

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);
+        if (clearingWithdrawInfo != null) {
-        clearingWithdrawInfo.setUpdateTime(DateUtils.getNowDate());
+            clearingWithdrawInfo.setWithdrawStatus(Constants.ONE);
-        clearingWithdrawInfoService.updateByPrimaryKeySelective(clearingWithdrawInfo);
+            clearingWithdrawInfo.setUpdateTime(DateUtils.getNowDate());
+            clearingWithdrawInfoService.updateByPrimaryKeySelective(clearingWithdrawInfo);
+        }
+
+        // 清分账单数据更新
+        List<ClearingBillInfo> clearingBillInfos = clearingBillInfoService.selectByWithdrawCode(withdrawCode);
+        if (CollectionUtils.isNotEmpty(clearingBillInfos)) {
+            for (ClearingBillInfo clearingBillInfo : clearingBillInfos) {
+                clearingBillInfo.setBillStatus("4");
+            }
+            clearingBillInfoService.updateBatchSelective(clearingBillInfos);
+        }
     }
 
     /**

jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java

@@ -728,7 +728,7 @@ public class AdapayService {
         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);
+        clearingBillInfoService.updateStatus(clearingBillIds, billStatus, id);
     }
 
     /**

jsowell-pile/src/main/java/com/jsowell/pile/mapper/ClearingBillInfoMapper.java

@@ -68,7 +68,7 @@ public interface ClearingBillInfoMapper {
 
     List<ClearingBillInfo> selectByMerchantId(@Param("merchantId") String merchantId, @Param("billStatus") String billStatus, @Param("tradeDate") String tradeDate);
 
-    void updateStatus(@Param("clearingBillIds") List<Integer> clearingBillIds, @Param("billStatus") String billStatus);
+    void updateStatus(@Param("clearingBillIds") List<Integer> clearingBillIds, @Param("billStatus") String billStatus, @Param("withdrawCode") String withdrawCode);
 
     /**
      * 后管用 查询运营商账单列表
@@ -77,4 +77,6 @@ public interface ClearingBillInfoMapper {
      * @return
      */
     List<MerchantClearingBillVO> getMerchantClearingBillList(GetClearingBillDTO dto);
+
+    List<ClearingBillInfo> selectByWithdrawCode(@Param("withdrawCode") String withdrawCode);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/ClearingBillInfoService.java

@@ -23,7 +23,7 @@ public interface ClearingBillInfoService {
 
     List<ClearingBillInfo> selectByMerchantId(String merchantId, String billStatus);
 
-    void updateStatus(List<Integer> clearingBillIds, String billStatus);
+    void updateStatus(List<Integer> clearingBillIds, String billStatus, String withdrawCode);
 
     /**
      * 后管用 查询运营商账单列表
@@ -44,5 +44,7 @@ public interface ClearingBillInfoService {
     int batchInsert(List<ClearingBillInfo> list);
 
     ClearingBillInfo selectByMerchantIdAndTradeDate(String merchantId, String tradeDate);
+
+    List<ClearingBillInfo> selectByWithdrawCode(String withdrawCode);
 }
 

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<Integer> clearingBillIds, String billStatus) {
+    public void updateStatus(List<Integer> 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<ClearingBillInfo> selectByWithdrawCode(String withdrawCode) {
+        return clearingBillInfoMapper.selectByWithdrawCode(withdrawCode);
+    }
 }
 

jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml

@@ -754,7 +754,7 @@
 
   <update id="updateStatus">
     update clearing_bill_info
-    set bill_status = #{billStatus,jdbcType=VARCHAR}
+    set bill_status = #{billStatus,jdbcType=VARCHAR}, withdraw_code = #{withdrawCode,jdbcType=VARCHAR}
     where id in
     <foreach close=")" collection="clearingBillIds" item="item" open="(" separator=",">
       #{item,jdbcType=INTEGER}
@@ -782,4 +782,12 @@
     order by
      t1.trade_date desc
   </select>
+
+  <select id="selectByWithdrawCode" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from clearing_bill_info
+    where del_flag = '0'
+    and withdraw_code = #{withdrawCode,jdbcType=VARCHAR}
+  </select>
 </mapper>