Merge branch 'dev/2024/0506/update-admin-Y' of feifan/mall-backend-admin into master

接通快递100查询物流信息

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/framework/delivery/core/client/dto/kd100/Kd100ExpressQueryRespDTO.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -12,7 +13,6 @@ import static cn.newfeifan.mall.framework.common.util.date.DateUtils.TIME_ZONE_D
 
 /**
  * 快递 100 实时快递查询 Resp DTO
- *
  * 参见  <a href="https://api.kuaidi100.com/document/5f0ffb5ebc8da837cbd8aefc">快递 100 文档</a>
  *
  * @author jason
@@ -37,7 +37,6 @@ public class Kd100ExpressQueryRespDTO {
 
     /**
      * 查询结果
-     *
      * 失败返回 "false"
      */
     private String result;
@@ -61,6 +60,11 @@ public class Kd100ExpressQueryRespDTO {
         @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
         private LocalDateTime time;
 
+        public void setTime(String time) {
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern(FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+            this.time = LocalDateTime.parse(time,formatter);
+        }
+
         /**
          * 轨迹描述
          */

feifan-server/src/main/resources/application.yaml

@@ -255,13 +255,13 @@ feifan:
       receive-expire-time: 14d # 收货的过期时间
       comment-expire-time: 7d # 评论的过期时间
     express:
-      client: kd_niao
+      client: KD_100
       kd-niao:
         api-key: cb022f1e-48f1-4c4a-a723-9001ac9676b8
         business-id: 1809751
       kd100:
-        key: pLXUGAwK5305
-        customer: E77DF18BE109F454A5CD319E44BF5177
+        key: vAeIErtY7248
+        customer: 7FA4F892DB920F6EB6DEACF31D6B0D4F
 
 debug: false