bugfix 时间参数查询默认判断问题

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/TradeReq.java

@@ -1,6 +1,5 @@
 package com.sckw.payment.model.vo.req;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sckw.core.model.vo.BasePara;
 import com.sckw.payment.model.constant.LedgerEnum;
 import lombok.Getter;
@@ -18,9 +17,7 @@ import java.util.List;
 public class TradeReq extends BasePara {
     @Serial
     private static final long serialVersionUID = 5328731681168692784L;
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private String startCreateTime;
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private String endCreateTime;
     private Integer trading;
     /**

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/AbsLedger.java

@@ -18,6 +18,12 @@ public abstract class AbsLedger {
         }
     }
 
+    public void backQueryCheck(Integer status) {
+        if (Objects.nonNull(status) && LedgerEnum.BACK.getStatus() != status) {
+            throw new BusinessException("只有【已退回】的单据才支持驳回查询!");
+        }
+    }
+
     public void detailCheck(Integer status) {
         List<Integer> objects = Lists.newArrayList(LedgerEnum.SAVE.getStatus(), LedgerEnum.BACK.getStatus(), LedgerEnum.REVOCATION.getStatus());
         if (Objects.nonNull(status) && !objects.contains(status)) {

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

@@ -80,6 +80,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
             logisticsDto.setStatusLabel(LedgerEnum.getDesc(logisticsDto.getStatus()));
         }
     }
+
     private void fillPara(LogisticsReq logisticsReq) {
         logisticsReq.setEntId(LoginUserHolder.getEntId());
         if (StringUtils.isNotBlank(logisticsReq.getStartCreateTime())) {
@@ -89,6 +90,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
             logisticsReq.setEndCreateTime(StringTimeUtil.fillEnd(logisticsReq.getEndCreateTime()));
         }
     }
+
     public PageRes<ILedger> shipperList(LogisticsReq logisticsReq) {
         fillPara(logisticsReq);
         PageHelper.startPage(logisticsReq.getPage(), logisticsReq.getPageSize());
@@ -155,8 +157,12 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpLedgerLogistics.setId(Objects.isNull(logisticsSendReq.getId()) ? new IdWorker(1).nextId() : logisticsSendReq.getId());
         kwpLedgerLogistics.setEntId(LoginUserHolder.getEntId());
         kwpLedgerLogistics.setName(logisticsSendReq.getName());
-        kwpLedgerLogistics.setStartTime(StringTimeUtil.startDateTime(logisticsSendReq.getStartTime()));
-        kwpLedgerLogistics.setEndTime(StringTimeUtil.endDateTime(logisticsSendReq.getEndTime()));
+        if (StringUtils.isNotBlank(logisticsSendReq.getStartTime())) {
+            kwpLedgerLogistics.setStartTime(StringTimeUtil.startDateTime(logisticsSendReq.getStartTime()));
+        }
+        if (StringUtils.isNotBlank(logisticsSendReq.getEndTime())) {
+            kwpLedgerLogistics.setEndTime(StringTimeUtil.endDateTime(logisticsSendReq.getEndTime()));
+        }
         kwpLedgerLogistics.setTaxRate(logisticsSendReq.getTaxRate());
         kwpLedgerLogistics.setTrading(logisticsSendReq.getTrading());
         kwpLedgerLogistics.setTotalPrice(logisticsSendReq.getTotalPrice());
@@ -324,6 +330,9 @@ public class KwpLedgerLogisticsService extends AbsLedger {
      * @return 物流对账单驳回记录
      */
     public List<KwpLedgerLogisticsTrack> queryBack(Long id) {
+        KwpLedgerLogistics kwpLedgerLogistics = logisticsMapper.selectById(id);
+        orderCheck(kwpLedgerLogistics);
+        backQueryCheck(kwpLedgerLogistics.getStatus());
         return logisticsTrackService.selectList(id, LedgerTrackEnum.REJECT);
     }
 

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

@@ -144,8 +144,12 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpLedgerTrade.setId(Objects.isNull(tradeSendReq.getId()) ? new IdWorker(1).nextId() : tradeSendReq.getId());
         kwpLedgerTrade.setEntId(LoginUserHolder.getEntId());
         kwpLedgerTrade.setName(tradeSendReq.getName());
-        kwpLedgerTrade.setStartTime(StringTimeUtil.startDateTime(tradeSendReq.getStartTime()));
-        kwpLedgerTrade.setEndTime(StringTimeUtil.endDateTime(tradeSendReq.getEndTime()));
+        if(StringUtils.isNotBlank(tradeSendReq.getStartTime())){
+            kwpLedgerTrade.setStartTime(StringTimeUtil.startDateTime(tradeSendReq.getStartTime()));
+        }
+        if(StringUtils.isNotBlank(tradeSendReq.getEndTime())){
+            kwpLedgerTrade.setEndTime(StringTimeUtil.endDateTime(tradeSendReq.getEndTime()));
+        }
         kwpLedgerTrade.setTaxRate(tradeSendReq.getTaxRate());
         kwpLedgerTrade.setTrading(tradeSendReq.getTrading());
         kwpLedgerTrade.setTotalPrice(tradeSendReq.getTotalPrice());
@@ -307,9 +311,7 @@ public class KwpLedgerTradeService extends AbsLedger {
 
     public String remove(Long id) {
         KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(id);
-        if (Objects.isNull(kwpLedgerTrade)) {
-            throw new BusinessException("对账单不存在!");
-        }
+        orderCheck(kwpLedgerTrade);
         deleteCheck(kwpLedgerTrade.getStatus());
         kwpLedgerTrade.setDelFlag(1);
         kwpLedgerTrade.setUpdateBy(LoginUserHolder.getUserId());
@@ -327,9 +329,7 @@ public class KwpLedgerTradeService extends AbsLedger {
      */
     public String backOrder(Long id) {
         KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(id);
-        if (Objects.isNull(kwpLedgerTrade)) {
-            throw new BusinessException("对账单不存在!");
-        }
+        orderCheck(kwpLedgerTrade);
         revokeCheck(kwpLedgerTrade.getStatus());
         kwpLedgerTrade.setStatus(LedgerEnum.REVOCATION.getStatus());
         kwpLedgerTrade.setUpdateBy(LoginUserHolder.getUserId());
@@ -347,6 +347,9 @@ public class KwpLedgerTradeService extends AbsLedger {
      * @return
      */
     public List<KwpLedgerTradeTrack> queryBack(Long id) {
+        KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(id);
+        orderCheck(kwpLedgerTrade);
+        backQueryCheck(kwpLedgerTrade.getStatus());
         return tradeTrackService.selectList(id, LedgerTrackEnum.REJECT);
     }
 
@@ -358,9 +361,7 @@ public class KwpLedgerTradeService extends AbsLedger {
      */
     public String doBack(LedgerReq ledgerReq) {
         KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(ledgerReq.getId());
-        if (Objects.isNull(kwpLedgerTrade)) {
-            throw new BusinessException("对账单不存在!");
-        }
+        orderCheck(kwpLedgerTrade);
         backCheck(kwpLedgerTrade.getStatus());
         kwpLedgerTrade.setStatus(LedgerEnum.BACK.getStatus());
         kwpLedgerTrade.setUpdateBy(LoginUserHolder.getUserId());
@@ -379,9 +380,7 @@ public class KwpLedgerTradeService extends AbsLedger {
     @Transactional(rollbackFor = Exception.class)
     public String confirmOrder(LedgerConfirmReq confirmReq) {
         KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(confirmReq.getId());
-        if (Objects.isNull(kwpLedgerTrade)) {
-            throw new BusinessException("对账单不存在!");
-        }
+        orderCheck(kwpLedgerTrade);
         confirmCheck(kwpLedgerTrade.getStatus());
         kwpLedgerTrade.setStatus(LedgerEnum.LEDGERED.getStatus());
         kwpLedgerTrade.setAuditPhone(confirmReq.getAuditPhone());
@@ -403,9 +402,7 @@ public class KwpLedgerTradeService extends AbsLedger {
     @Transactional(rollbackFor = Exception.class)
     public String orderSuccess(LedgerSuccessReq ledgerReq) {
         KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(ledgerReq.getId());
-        if (Objects.isNull(kwpLedgerTrade)) {
-            throw new BusinessException("对账单不存在!");
-        }
+        orderCheck(kwpLedgerTrade);
         successCheck(kwpLedgerTrade.getStatus());
 
         kwpLedgerTrade.setReceiptTime(LocalDateTime.of(ledgerReq.getReceiptTime(), LocalTime.MIN));

sckw-modules/sckw-payment/src/main/resources/bootstrap.yml

@@ -12,4 +12,8 @@ spring:
 
 mybatis-plus:
   configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+logging:
+  level:
+    root: info
+    com.sckw.payment: debug

sckw-modules/sckw-payment/src/main/resources/mapper/KwpLedgerLogisticsMapper.xml

@@ -94,7 +94,7 @@
             <if test="logisticsReq.trading != null">
                 and kll.trading = #{logisticsReq.trading,jdbcType=INTEGER}
             </if>
-            <if test="logisticsReq.startCreateTime != null and logisticsReq.endCreateTime != null">
+            <if test="logisticsReq.startCreateTime != null and logisticsReq.startCreateTime != '' and logisticsReq.endCreateTime != null and logisticsReq.endCreateTime != ''">
                 and kll.generate_time between #{logisticsReq.startCreateTime,jdbcType=TIMESTAMP}
                     and #{logisticsReq.endCreateTime,jdbcType=TIMESTAMP}
             </if>

sckw-modules/sckw-payment/src/main/resources/mapper/KwpLedgerTradeMapper.xml

@@ -141,7 +141,7 @@
             <if test="tradeReq.trading != null">
                 and klt.trading = #{tradeReq.trading,jdbcType=INTEGER}
             </if>
-            <if test="tradeReq.startCreateTime != null and tradeReq.endCreateTime != null">
+            <if test="tradeReq.endCreateTime != null and tradeReq.endCreateTime != '' and tradeReq.startCreateTime != null and tradeReq.startCreateTime != ''">
                 and klt.generate_time between #{tradeReq.startCreateTime,jdbcType=TIMESTAMP} and
                     #{tradeReq.endCreateTime,jdbcType=TIMESTAMP}
             </if>