Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/utils/DateTimeUtil.java → sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/DateTimeUtil.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.utils;
+package com.sckw.core.utils;
 
 
 import java.time.LocalDate;
@@ -12,7 +12,7 @@ import java.util.List;
 
 /**
  * @description: 时间工具类
- * @author: LengFaQiang
+ * @author: xucaiqin
  * @copyright
  * @create: 2022-01-27 16:04
  **/
@@ -26,6 +26,26 @@ public class DateTimeUtil {
     public static final DateTimeFormatter YYYY_MM = DateTimeFormatter.ofPattern(YM);
     public static final DateTimeFormatter HH_MM_SS = DateTimeFormatter.ofPattern(HMS);
 
+    /**
+     * 拼接 00:00:00
+     *
+     * @param localDate 日期
+     * @return yyyy-MM-dd 00:00:00
+     */
+    public static LocalDateTime appendStart(LocalDate localDate) {
+        return LocalDateTime.of(localDate, LocalTime.MIN);
+    }
+
+    /**
+     * 拼接 23:59:59
+     *
+     * @param localDate 日期
+     * @return yyyy-MM-dd 23:59:59
+     */
+    public static LocalDateTime appendEnd(LocalDate localDate) {
+        return LocalDateTime.of(localDate, LocalTime.MAX);
+    }
+
     public static LocalDateTime parse(String date) {
         return LocalDateTime.parse(date, YYYY_MM_DD_HH_MM_SS);
     }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfDriverService.java

@@ -518,11 +518,15 @@ public class KwfDriverService {
         KwfDriverCard driverCard = new KwfDriverCard();
         BeanUtils.copyProperties(params, driverCard);
         driverCard.setStatus(Global.YES);
-        if (StringUtils.isBlank(driverCard.getCertificateMain()) && StringUtils.isBlank(driverCard.getCertificateRevolt())) {
+        String certificateMain = driverCard.getCertificateMain();
+        String certificateRevolt = driverCard.getCertificateRevolt();
+        if (StringUtils.isBlank(certificateMain) && StringUtils.isBlank(certificateRevolt)) {
             driverCard.setStatus(Global.NO);
             driverCard.setCertificateMain(Global.EMPTY_STRING);
             driverCard.setCertificateRevolt(Global.EMPTY_STRING);
         }
+        driverCard.setCertificateMain(StringUtils.isBlank(certificateMain) ? Global.EMPTY_STRING : driverCard.getCertificateMain());
+        driverCard.setCertificateRevolt(StringUtils.isBlank(certificateRevolt) ? Global.EMPTY_STRING : driverCard.getCertificateRevolt());
 
         /**数据更新**/
         int count = 0;
@@ -569,11 +573,15 @@ public class KwfDriverService {
         KwfDriverLicense driverLicense = new KwfDriverLicense();
         BeanUtils.copyProperties(params, driverLicense);
         driverLicense.setStatus(Global.YES);
-        if (StringUtils.isBlank(driverLicense.getCertificateMain()) && StringUtils.isBlank(driverLicense.getCertificateRevolt())) {
+        String certificateMain = driverLicense.getCertificateMain();
+        String certificateRevolt = driverLicense.getCertificateRevolt();
+        if (StringUtils.isBlank(certificateMain) && StringUtils.isBlank(certificateRevolt)) {
             driverLicense.setStatus(Global.NO);
             driverLicense.setCertificateMain(Global.EMPTY_STRING);
             driverLicense.setCertificateRevolt(Global.EMPTY_STRING);
         }
+        driverLicense.setCertificateMain(StringUtils.isBlank(certificateMain) ? Global.EMPTY_STRING : driverLicense.getCertificateMain());
+        driverLicense.setCertificateRevolt(StringUtils.isBlank(certificateRevolt) ? Global.EMPTY_STRING : driverLicense.getCertificateRevolt());
 
         /**数据更新**/
         int count = 0;
@@ -621,11 +629,15 @@ public class KwfDriverService {
         KwfDriverQualification driverQual = new KwfDriverQualification();
         BeanUtils.copyProperties(params, driverQual);
         driverQual.setStatus(Global.YES);
-        if (StringUtils.isBlank(driverQual.getCertificateMain()) && StringUtils.isBlank(driverQual.getCertificateRevolt())) {
+        String certificateMain = driverQual.getCertificateMain();
+        String certificateRevolt = driverQual.getCertificateRevolt();
+        if (StringUtils.isBlank(certificateMain) && StringUtils.isBlank(certificateRevolt)) {
             driverQual.setStatus(Global.NO);
             driverQual.setCertificateMain(Global.EMPTY_STRING);
             driverQual.setCertificateRevolt(Global.EMPTY_STRING);
         }
+        driverQual.setCertificateMain(StringUtils.isBlank(certificateMain) ? Global.EMPTY_STRING : driverQual.getCertificateMain());
+        driverQual.setCertificateRevolt(StringUtils.isBlank(certificateRevolt) ? Global.EMPTY_STRING : driverQual.getCertificateRevolt());
 
         /**数据更新**/
         int count = 0;

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

@@ -478,11 +478,15 @@ public class KwfTruckService {
         KwfTruckLicense truckLicense = new KwfTruckLicense();
         BeanUtils.copyProperties(params, truckLicense);
         truckLicense.setStatus(Global.YES);
-        if (StringUtils.isBlank(truckLicense.getCertificateMain()) && StringUtils.isBlank(truckLicense.getCertificateRevolt())) {
+        String certificateMain = truckLicense.getCertificateMain();
+        String certificateRevolt = truckLicense.getCertificateRevolt();
+        if (StringUtils.isBlank(certificateMain) && StringUtils.isBlank(certificateRevolt)) {
             truckLicense.setStatus(Global.NO);
             truckLicense.setCertificateMain(Global.EMPTY_STRING);
             truckLicense.setCertificateRevolt(Global.EMPTY_STRING);
         }
+        truckLicense.setCertificateMain(StringUtils.isBlank(certificateMain) ? Global.EMPTY_STRING : truckLicense.getCertificateMain());
+        truckLicense.setCertificateRevolt(StringUtils.isBlank(certificateRevolt) ? Global.EMPTY_STRING : truckLicense.getCertificateRevolt());
 
         /**数据更新**/
         int count = 0;
@@ -520,11 +524,15 @@ public class KwfTruckService {
         KwfTransportLicense transportLicense = new KwfTransportLicense();
         BeanUtils.copyProperties(params, transportLicense);
         transportLicense.setStatus(Global.YES);
-        if (StringUtils.isBlank(transportLicense.getCertificateMain()) && StringUtils.isBlank(transportLicense.getCertificateRevolt())) {
+        String certificateMain = transportLicense.getCertificateMain();
+        String certificateRevolt = transportLicense.getCertificateRevolt();
+        if (StringUtils.isBlank(certificateMain) && StringUtils.isBlank(certificateRevolt)) {
             transportLicense.setStatus(Global.NO);
             transportLicense.setCertificateMain(Global.EMPTY_STRING);
             transportLicense.setCertificateRevolt(Global.EMPTY_STRING);
         }
+        transportLicense.setCertificateMain(StringUtils.isBlank(certificateMain) ? Global.EMPTY_STRING : transportLicense.getCertificateMain());
+        transportLicense.setCertificateRevolt(StringUtils.isBlank(certificateRevolt) ? Global.EMPTY_STRING : transportLicense.getCertificateRevolt());
 
         /**数据更新**/
         int count = 0;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpLedgerLogisticsController.java

@@ -250,7 +250,7 @@ public class KwpLedgerLogisticsController {
         logisticsReq.setUnitTypeTwo(LogisticsUnitType.SHIPPER);
         List<LedgerLogisticsDto> list = kwpLedgerLogisticsService.exportList(logisticsReq, logisticsReq.getIdList());
         if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("没有可导出的数据");
+            return HttpResult.error("暂无数据，请确认");
         }
         List<LedgerLogisticsVo> collect = list.stream().map(a -> {
             LedgerLogisticsVo ledgerLogisticsVo = new LedgerLogisticsVo();
@@ -275,7 +275,7 @@ public class KwpLedgerLogisticsController {
         logisticsReq.setUnitTypeTwo(LogisticsUnitType.CARRIER);
         List<LedgerLogisticsDto> list = kwpLedgerLogisticsService.exportList(logisticsReq, logisticsReq.getIdList());
         if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("没有可导出的数据");
+            return HttpResult.error("暂无数据，请确认");
         }
         List<LedgerLogisticsVo> collect = list.stream().map(a -> {
             LedgerLogisticsVo ledgerLogisticsVo = new LedgerLogisticsVo();

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpLedgerTradeController.java

@@ -248,7 +248,7 @@ public class KwpLedgerTradeController {
         tradeReq.setUnitTypeTwo(TradeUnitType.SELL);
         List<LedgerTradeDto> list = kwpLedgerTradeService.exportList(tradeReq, tradeReq.getIdList());
         if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("没有可导出的数据");
+            return HttpResult.error("暂无数据，请确认");
         }
         List<LedgerTradeVo> collect = list.stream().map(a -> {
             LedgerTradeVo ledgerTradeVo = new LedgerTradeVo();
@@ -272,7 +272,7 @@ public class KwpLedgerTradeController {
         tradeReq.setUnitTypeTwo(TradeUnitType.PURCHASE);
         List<LedgerTradeDto> list = kwpLedgerTradeService.exportList(tradeReq, tradeReq.getIdList());
         if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("没有可导出的数据");
+            return HttpResult.error("暂无数据，请确认");
         }
         List<LedgerTradeVo> collect = list.stream().map(a -> {
             LedgerTradeVo ledgerTradeVo = new LedgerTradeVo();

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpSettlementLogisticsController.java

@@ -105,7 +105,7 @@ public class KwpSettlementLogisticsController {
      */
     private HttpResult export(HttpServletResponse response, List<SettlementLogisticsDto> list) {
         if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("没有可导出的数据");
+            return HttpResult.error("暂无数据，请确认");
         }
         List<SettlementLogisticsVo> collect = list.stream().map(a -> {
             SettlementLogisticsVo settlementLogisticsVo = new SettlementLogisticsVo();

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpSettlementTradeController.java

@@ -166,7 +166,7 @@ public class KwpSettlementTradeController {
      */
     private HttpResult export(HttpServletResponse response, List<SettlementTradeDto> list) {
         if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("没有可导出的数据");
+            return HttpResult.error("暂无数据，请确认");
         }
         List<SettlementTradeVo> collect = list.stream().map(a -> {
             SettlementTradeVo settlementTradeVo = new SettlementTradeVo();

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/LedgerLogisticsController.java

@@ -76,7 +76,7 @@ public class LedgerLogisticsController {
 
 
     /**
-     * 导出 todo
+     * 导出
      *
      * @param response
      * @param logisticsReq
@@ -92,7 +92,7 @@ public class LedgerLogisticsController {
             list = ledgerLogisticsService.selectList(logisticsReq.getIdList());
         }
         if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("没有可导出的数据");
+            return HttpResult.error("暂无数据，请确认");
         }
         List<LedgerLogisticsExport> collect = list.stream().map(a -> {
             LedgerLogisticsExport ledgerLogisticsVo = new LedgerLogisticsExport();

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/LedgerTradeController.java

@@ -92,7 +92,7 @@ public class LedgerTradeController {
         }
 
         if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("没有可导出的数据");
+            return HttpResult.error("暂无数据，请确认");
         }
         List<LedgerTradeExport> collect = list.stream().map(a -> {
             LedgerTradeExport ledgerTradeVo = new LedgerTradeExport();

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/SettlementLogisticsController.java

@@ -69,7 +69,7 @@ public class SettlementLogisticsController {
         settlementReq.setUnitTypeTwo(LogisticsUnitType.CARRIER);
         List<SettlementLogistics> list = settlementLogisticsService.exportList(settlementReq);
         if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("没有可导出的数据");
+            return HttpResult.error("暂无数据，请确认");
         }
         List<SettlementLogisticsExportVo> collect = list.stream().map(a -> {
             SettlementLogisticsExportVo settlementLogisticsVo = new SettlementLogisticsExportVo();

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/SettlementTradeController.java

@@ -75,7 +75,7 @@ public class SettlementTradeController {
         settlementReq.setUnitTypeTwo(TradeUnitType.PURCHASE);
         List<SettlementTrade> list = settlementTradeService.exportList(settlementReq,settlementReq.getIdList());
         if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.error("没有可导出的数据");
+            return HttpResult.error("暂无数据，请确认");
         }
         List<SettlementTradeExportVo> collect = list.stream().map(a -> {
             SettlementTradeExportVo settlementTradeExportVo = new SettlementTradeExportVo();

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dubbo/PaymentDubboServiceImpl.java

@@ -14,7 +14,7 @@ import com.sckw.payment.model.constant.TradeUnitType;
 import com.sckw.payment.model.dto.LedgerSize;
 import com.sckw.payment.model.dto.MoneyType;
 import com.sckw.payment.service.*;
-import com.sckw.payment.utils.DateTimeUtil;
+import com.sckw.core.utils.DateTimeUtil;
 import com.sckw.payment.utils.DecimalUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

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

@@ -2,7 +2,7 @@ package com.sckw.payment.service;
 
 import com.sckw.payment.dao.KwpSettlementRecordMapper;
 import com.sckw.payment.model.vo.SettlementRecord;
-import com.sckw.payment.utils.DateTimeUtil;
+import com.sckw.core.utils.DateTimeUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

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

@@ -41,7 +41,7 @@ import com.sckw.payment.model.vo.req.page.MoneyPage;
 import com.sckw.payment.model.vo.req.page.PrePayPage;
 import com.sckw.payment.model.vo.req.page.RefundPage;
 import com.sckw.payment.model.vo.res.*;
-import com.sckw.payment.utils.DateTimeUtil;
+import com.sckw.core.utils.DateTimeUtil;
 import com.sckw.redis.config.RedisLockUtil;
 import com.sckw.redis.constant.RedisLockKey;
 import com.sckw.system.api.RemoteSystemService;

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

@@ -5,7 +5,7 @@ import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.payment.model.vo.SettlementRecord;
 import com.sckw.payment.model.vo.req.FinanceCount;
 import com.sckw.payment.model.vo.res.EChartsVo;
-import com.sckw.payment.utils.DateTimeUtil;
+import com.sckw.core.utils.DateTimeUtil;
 import com.sckw.payment.utils.DecimalUtils;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;