Browse Source

Merge remote-tracking branch 'origin/milestone-20260113-现金管理0109' into milestone-20260113-现金管理0109

milestone-20260113-现金管理0109
lijianlin 3 hours ago
parent
commit
5df7e32fbd
  1. 4
      src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java
  2. 3
      src/main/resources/cashMapper/CashRefundMapper.xml

4
src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java

@ -593,7 +593,7 @@ CashRecordDone cashRecordDone1 = new CashRecordDone();
// 2. 收集 status == 6 的记录 ID注意status int // 2. 收集 status == 6 的记录 ID注意status int
List<Integer> needQueryIds = new ArrayList<>(); List<Integer> needQueryIds = new ArrayList<>();
for (FundsDTO dto : list) { for (FundsDTO dto : list) {
if (dto.getStatuses() != null && dto.getStatuses().contains(6)) {
if (dto.getStatus() != null && dto.getStatus()==6) {
needQueryIds.add(dto.getId()); needQueryIds.add(dto.getId());
} }
} }
@ -611,7 +611,7 @@ CashRecordDone cashRecordDone1 = new CashRecordDone();
// 5. 回填到账金额和到账币种 // 5. 回填到账金额和到账币种
for (FundsDTO dto : list) { for (FundsDTO dto : list) {
if (dto.getStatuses() != null && dto.getStatuses().contains(6)) {
if (dto.getStatus() != null && dto.getStatus()==6) {
FundsDTO detail = detailMap.get(dto.getId()); FundsDTO detail = detailMap.get(dto.getId());
if (detail != null) { if (detail != null) {
// 将到账金额转为负数正数 负数 // 将到账金额转为负数正数 负数

3
src/main/resources/cashMapper/CashRefundMapper.xml

@ -459,7 +459,8 @@
</select> </select>
<select id="selectRefundCount" resultType="com.example.demo.domain.vo.cash.FundsDTO"> <select id="selectRefundCount" resultType="com.example.demo.domain.vo.cash.FundsDTO">
select crr.refund_currency, select crr.refund_currency,
crr.refund_amount
crr.refund_amount,
crr.related_id
from cash_record_refund crr from cash_record_refund crr
<where> <where>
<if test="needQueryIds != null and needQueryIds.size() > 0"> <if test="needQueryIds != null and needQueryIds.size() > 0">

Loading…
Cancel
Save