From d9520c15eb8fe7f240b6018043e617ab1c9184fa Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 26 五月 2025 18:15:17 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java |   75 +++++++++++++++++++++++++++++++++++++
 1 files changed, 74 insertions(+), 1 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
index e752211..58914ca 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
@@ -783,6 +783,77 @@
         List<SettleParentStatusVO> parentStatusVOList = this.getParentStatus(settleClaims);
         settleClaims.setParentStatusVOList(parentStatusVOList);
         settleClaims.setStatusName(Constants.SettleClaimsStatus.getName(settleClaims.getStatus()));
+
+        if(Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.REJECT_DEAL.getKey())
+            || Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.WAIT_DISCUSS_REJECT.getKey())){
+            SettleClaimsLog settleClaimsLog = settleClaimsLogJoinMapper.selectJoinOne(SettleClaimsLog.class,
+                    new MPJLambdaWrapper<SettleClaimsLog>()
+                            .selectAll(SettleClaimsLog.class)
+                            .selectAs(SystemUser::getRealname,SettleClaimsLog::getCreatorName)
+                            .selectAs(SystemUser::getType,SettleClaimsLog::getCreatorType)
+                            .selectAs(Company::getName,SettleClaimsLog::getCompanyName)
+                            .leftJoin(SystemUser.class,SystemUser::getId,SettleClaimsLog::getCreator)
+                            .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
+                            .eq(SettleClaimsLog::getSettleClainmsId,settleClaims.getId())
+                            .in(SettleClaimsLog::getObjType,Constants.SettleClaimsLogType.PLATFORM_DISCUSS_REFUSE.getKey(),
+                            Constants.SettleClaimsLogType.PLATFORM_REFUSE_ACCEPTANCE.getKey())
+                    .orderByDesc(SettleClaimsLog::getCreateDate)
+                    .last(" limit 1")
+            );
+            settleClaims.setRefuseSettleClaimsLog(settleClaimsLog);
+        }else if(Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey())){
+            SettleClaimsLog settleClaimsLog = settleClaimsLogJoinMapper.selectJoinOne(SettleClaimsLog.class,
+                    new MPJLambdaWrapper<SettleClaimsLog>()
+                            .selectAll(SettleClaimsLog.class)
+                            .selectAs(SystemUser::getRealname,SettleClaimsLog::getCreatorName)
+                            .selectAs(SystemUser::getType,SettleClaimsLog::getCreatorType)
+                            .selectAs(Company::getName,SettleClaimsLog::getCompanyName)
+                            .leftJoin(SystemUser.class,SystemUser::getId,SettleClaimsLog::getCreator)
+                            .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
+                            .eq(SettleClaimsLog::getSettleClainmsId,settleClaims.getId())
+                            .in(SettleClaimsLog::getObjType,Constants.SettleClaimsLogType.PLATFORM_RETURN.getKey())
+                            .orderByDesc(SettleClaimsLog::getCreateDate)
+                            .last(" limit 1")
+            );
+            settleClaims.setRefuseSettleClaimsLog(settleClaimsLog);
+        }else if(Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.ACCEPTANCE.getKey())
+                &&Constants.equalsInteger(settleClaims.getWaitSupplement(),Constants.ONE)
+        ){
+            SettleClaimsLog settleClaimsLog = settleClaimsLogJoinMapper.selectJoinOne(SettleClaimsLog.class,
+                    new MPJLambdaWrapper<SettleClaimsLog>()
+                            .selectAll(SettleClaimsLog.class)
+                            .selectAs(SystemUser::getRealname,SettleClaimsLog::getCreatorName)
+                            .selectAs(SystemUser::getType,SettleClaimsLog::getCreatorType)
+                            .selectAs(Company::getName,SettleClaimsLog::getCompanyName)
+                            .leftJoin(SystemUser.class,SystemUser::getId,SettleClaimsLog::getCreator)
+                            .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
+                            .eq(SettleClaimsLog::getSettleClainmsId,settleClaims.getId())
+                            .in(SettleClaimsLog::getObjType,Constants.SettleClaimsLogType.SUPPLEMENT_DESCRIBE.getKey())
+                            .orderByDesc(SettleClaimsLog::getCreateDate)
+                            .last(" limit 1")
+            );
+            settleClaims.setRefuseSettleClaimsLog(settleClaimsLog);
+        }else if(Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.CLOSE_CASE.getKey())){
+            SettleClaimsLog settleClaimsLog = settleClaimsLogJoinMapper.selectJoinOne(SettleClaimsLog.class,
+                    new MPJLambdaWrapper<SettleClaimsLog>()
+                            .selectAll(SettleClaimsLog.class)
+                            .selectAs(SystemUser::getRealname,SettleClaimsLog::getCreatorName)
+                            .selectAs(SystemUser::getType,SettleClaimsLog::getCreatorType)
+                            .selectAs(Company::getName,SettleClaimsLog::getCompanyName)
+                            .leftJoin(SystemUser.class,SystemUser::getId,SettleClaimsLog::getCreator)
+                            .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
+                            .eq(SettleClaimsLog::getSettleClainmsId,settleClaims.getId())
+                            .in(SettleClaimsLog::getObjType,Constants.SettleClaimsLogType.PLATFORM_FINISH.getKey())
+                            .orderByDesc(SettleClaimsLog::getCreateDate)
+                            .last(" limit 1")
+            );
+            settleClaims.setRefuseSettleClaimsLog(settleClaimsLog);
+        }
+
+
+
+
+
         return settleClaims;
     }
 
@@ -1726,6 +1797,7 @@
                 throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝涓氬姟鐘舵�佸凡娴佽浆~");
             }
             settleClaimsMapper.update(null,new UpdateWrapper<SettleClaims>().lambda()
+                            .set(SettleClaims::getWaitSupplement,Constants.ZERO)
                     .eq(SettleClaims::getId,dto.getId()).set(SettleClaims::getEditDate,DateUtil.getCurrDateTime()).set(SettleClaims::getWaitSupplement,Constants.ZERO));
         }
         multifileJoinMapper.delete(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,dto.getId()).eq(Multifile::getObjType,Constants.MultiFile.LP_OTHER_FILE.getKey()));
@@ -2250,7 +2322,8 @@
         update.setHpAccountContent(dto.getCompensationJson());
         update.setHpAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
         update.setHpOtherAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
-        update.setId(settleClaims.getId()); 
+        update.setId(settleClaims.getId());
+        update.setFeeUpdate(Constants.ONE);
         settleClaimsMapper.updateById(update);
 
         //瀛樺偍鏃ュ織

--
Gitblit v1.9.3