From e609a57af98d0eed0f3092d5d03a5d9248f251a0 Mon Sep 17 00:00:00 2001
From: baozhipeng <961815525@qq.com>
Date: Fri, 17 Dec 2021 15:01:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/service/impl/PayPaymentCheckServiceImpl.java    | 6 ++++--
 .../jero/modules/system/service/impl/SysBaseApiImpl.java    | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

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<PayPaymentCheckMappe
         LambdaQueryWrapper<PayPaymentRecordSub> 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<PayPaymentRecordSub> list = payPaymentCheckService.list(wrapper);
         list.forEach(p -> {
             if (StringUtils.isNotBlank(p.getPaymentStatus())) {
@@ -408,7 +408,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
         payPaymentRecord.setReviewTime(new Date());
 
         payPaymentRecordMapper.updateById(payPaymentRecord);
-        //新增来款记录表子表
+        //更新来款记录表子表
         PayPaymentRecordSub payPaymentRecordSub = new PayPaymentRecordSub();
         BeanUtils.copyProperties(payPaymentRecord, payPaymentRecordSub);
 
@@ -416,6 +416,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
         LambdaUpdateWrapper<PayPaymentRecordSub> 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("企业用户");
 			}