xucaiqin 2 лет назад
Родитель
Сommit
cac391f6f0

+ 2 - 2
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerLogisticsService.java

@@ -338,11 +338,11 @@ public class KwpLedgerLogisticsService extends AbsLedger {
      * @param id 物流对账单id
      * @return 物流对账单驳回记录
      */
-    public List<KwpLedgerLogisticsTrack> queryBack(Long id) {
+    public KwpLedgerLogisticsTrack queryBack(Long id) {
         KwpLedgerLogistics kwpLedgerLogistics = logisticsMapper.selectById(id);
         orderCheck(kwpLedgerLogistics);
         backQueryCheck(kwpLedgerLogistics.getStatus());
-        return logisticsTrackService.selectList(id, LedgerTrackEnum.REJECT);
+        return logisticsTrackService.selectOne(id, LedgerTrackEnum.REJECT);
     }
 
     /**

+ 4 - 3
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerLogisticsTrackService.java

@@ -10,7 +10,6 @@ import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.util.List;
 import java.util.Objects;
 
 /**
@@ -45,12 +44,14 @@ public class KwpLedgerLogisticsTrackService {
      * @param status 流程状态
      * @return
      */
-    public List<KwpLedgerLogisticsTrack> selectList(@NotNull Long id, LedgerTrackEnum status) {
+    public KwpLedgerLogisticsTrack selectOne(@NotNull Long id, LedgerTrackEnum status) {
         LambdaQueryWrapper<KwpLedgerLogisticsTrack> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(KwpLedgerLogisticsTrack::getLLedgerId, id);
         wrapper.eq(Objects.nonNull(status), KwpLedgerLogisticsTrack::getStatus, status.getStatus());
         wrapper.eq(KwpLedgerLogisticsTrack::getDelFlag, 0);
-        return logisticsTrackMapper.selectList(wrapper);
+        wrapper.orderByDesc(KwpLedgerLogisticsTrack::getCreateTime);
+        wrapper.last("limit 1");
+        return logisticsTrackMapper.selectOne(wrapper);
     }
 
 

+ 2 - 2
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerTradeService.java

@@ -353,11 +353,11 @@ public class KwpLedgerTradeService extends AbsLedger {
      * @param id
      * @return
      */
-    public List<KwpLedgerTradeTrack> queryBack(Long id) {
+    public KwpLedgerTradeTrack queryBack(Long id) {
         KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(id);
         orderCheck(kwpLedgerTrade);
         backQueryCheck(kwpLedgerTrade.getStatus());
-        return tradeTrackService.selectList(id, LedgerTrackEnum.REJECT);
+        return tradeTrackService.selectOne(id, LedgerTrackEnum.REJECT);
     }
 
     /**

+ 4 - 3
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerTradeTrackService.java

@@ -10,7 +10,6 @@ import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.util.List;
 import java.util.Objects;
 
 /**
@@ -46,12 +45,14 @@ public class KwpLedgerTradeTrackService {
      * @param status 流程状态
      * @return
      */
-    public List<KwpLedgerTradeTrack> selectList(@NotNull Long id, LedgerTrackEnum status) {
+    public KwpLedgerTradeTrack selectOne(@NotNull Long id, LedgerTrackEnum status) {
         LambdaQueryWrapper<KwpLedgerTradeTrack> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(KwpLedgerTradeTrack::getTLedgerId, id);
         wrapper.eq(Objects.nonNull(status), KwpLedgerTradeTrack::getStatus, status.getStatus());
         wrapper.eq(KwpLedgerTradeTrack::getDelFlag, 0);
-        return tradeTrackMapper.selectList(wrapper);
+        wrapper.orderByDesc(KwpLedgerTradeTrack::getCreateTime);
+        wrapper.last("limit 1");
+        return tradeTrackMapper.selectOne(wrapper);
     }
 
     public void remove(Long tLedgerId) {