diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java index c4d2185a..39d4d936 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java @@ -153,7 +153,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(PayPaymentRecordSub::getProjectId, id); wrapper.ne(PayPaymentRecordSub::getPaymentStatus, PaymentStatusEnum.TO_BE_REVIEWED.getCode()); - wrapper.orderByAsc(PayPaymentRecordSub::getPaymentDate); + wrapper.orderByAsc(PayPaymentRecordSub::getPaymentDate,PayPaymentRecordSub::getCreateTime); List list = payPaymentCheckService.list(wrapper); list.forEach(p -> { if (StringUtils.isNotBlank(p.getPaymentStatus())) { @@ -408,7 +408,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl wrapper = new LambdaUpdateWrapper<>(); wrapper.eq(PayPaymentRecordSub::getRecordId,payPaymentRecord.getId()); wrapper.eq(PayPaymentRecordSub::getProjectId,payPaymentRecord.getProjectId()); + wrapper.orderByDesc(PayPaymentRecordSub::getCreateTime); + wrapper.last("limit 1"); payPaymentCheckMapper.update(payPaymentRecordSub,wrapper); BigDecimal newPaidAmount; diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java index 11a473a7..cb29052a 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java @@ -124,7 +124,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { }else { BeanUtils.copyProperties(contactsManagement, loginUser); loginUser.setIsCompanyUser(true); - loginUser.setUsername(contactsManagement.getName()); + loginUser.setUsername(contactsManagement.getPhone()); loginUser.setRealname(contactsManagement.getName()); loginUser.setRoleCode("企业用户"); }