|
@@ -183,11 +183,10 @@ public class UseMoneyServiceImpl implements UseMoneyService {
|
|
|
Set<String> companyIds = convertSet(records, UseMoneyEarnestRespVO::getPaymentCompanyId);
|
|
|
Map<String, CompanyRespDTO> companyMap = companyApi.getCompanyMap(companyIds);
|
|
|
for (UseMoneyEarnestRespVO record : records) {
|
|
|
- if (1 == record.getIWriteOff()) {
|
|
|
- record.setStatus("已核销");
|
|
|
- }
|
|
|
- if (0 == record.getIWriteOff()) {
|
|
|
+ if (record.getIWriteOff()==null||0 == record.getIWriteOff()) {
|
|
|
record.setStatus("未核销");
|
|
|
+ }else if (1 == record.getIWriteOff()) {
|
|
|
+ record.setStatus("已核销");
|
|
|
}
|
|
|
CompanyRespDTO companyRespDTO = companyMap.get(record.getPaymentCompanyId());
|
|
|
if (companyRespDTO != null) {
|
|
@@ -434,6 +433,8 @@ public class UseMoneyServiceImpl implements UseMoneyService {
|
|
|
detailDO.setUseMoneyId(updateObj.getId());
|
|
|
detailDO.setIsvalid(1);
|
|
|
detailDO.setCreateTime(LocalDateTime.now());
|
|
|
+ detailDO.setIWriteOff(0);
|
|
|
+ detailDO.setWriteOffAmount(new BigDecimal(0));
|
|
|
});
|
|
|
useMoneyDetailDao.insertBatch(detailDOS);
|
|
|
}
|