Commit 7fdb3241 authored by yexiong.wang's avatar yexiong.wang

fix

parent 4dc9d8a2
...@@ -14,6 +14,6 @@ public class ApplyBill { ...@@ -14,6 +14,6 @@ public class ApplyBill {
if (applyBill == null){ if (applyBill == null){
return false; return false;
} }
return Objects.equals(applyBill.getBillId(), this.getBillId()) && applyBill.getAmount().compareTo(this.getAmount()) == 0; return Objects.equals(applyBill.getBillId(), this.getBillId());
} }
} }
...@@ -95,10 +95,12 @@ public class VccServiceImpl implements IVccService { ...@@ -95,10 +95,12 @@ public class VccServiceImpl implements IVccService {
for (OfflineRepaySubmitRecord record:byUserIdEqualsAndRepayTypeEquals){ for (OfflineRepaySubmitRecord record:byUserIdEqualsAndRepayTypeEquals){
List<ApplyBill> billList = GSON.fromJson(record.getBills(), new TypeToken<List<ApplyBill>>() { List<ApplyBill> billList = GSON.fromJson(record.getBills(), new TypeToken<List<ApplyBill>>() {
}.getType()); }.getType());
log.info("billList={}",billList); log.info("billList={},applyBill={}",billList,applyBill);
if (billList.contains(applyBill)){ if (billList.contains(applyBill)){
log.info("发现已经提交过了,补充流水号前:voList={}",voList);
voList.get(i).setSerialNo(record.getSerialNo()); voList.get(i).setSerialNo(record.getSerialNo());
voList.get(i).setApprovalStatus(record.getApprovalStatus()); voList.get(i).setApprovalStatus(record.getApprovalStatus());
log.info("发现已经提交过了,补充流水号后:voList={}",voList);
break; break;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment