From 586a507bb172f046394d951b285d1edda74cfef7 Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Wed, 25 Dec 2024 10:01:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=86=E5=8C=85=E8=A3=B9?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 framework/src/main/java/cn/lili/common/validation/Phone.java  | 2 +-
 .../order/order/serviceimpl/OrderPackageServiceImpl.java      | 4 ++--
 .../modules/order/order/serviceimpl/OrderServiceImpl.java     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/framework/src/main/java/cn/lili/common/validation/Phone.java b/framework/src/main/java/cn/lili/common/validation/Phone.java
index 9acdd3b9..4df00820 100644
--- a/framework/src/main/java/cn/lili/common/validation/Phone.java
+++ b/framework/src/main/java/cn/lili/common/validation/Phone.java
@@ -22,7 +22,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 @Constraint(validatedBy = {PhoneValidator.class})
 public @interface Phone {
 
-    String regexp() default "1[3|4|5|7|8]\\d{9}";
+    String regexp() default "1[3|4|5|7|8|9]\\d{9}";
 
     String message() default "手机号码格式不正确";
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPackageServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPackageServiceImpl.java
index 92319c07..d616813e 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPackageServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPackageServiceImpl.java
@@ -54,8 +54,8 @@ public class OrderPackageServiceImpl extends ServiceImpl<OrderPackageMapper, Ord
             orderPackageVO.setOrderPackageItemList(orderPackageItemList);
             String str = orderPackage.getConsigneeMobile();
             str = str.substring(str.length() - 4);
-//            Traces traces = logisticsService.getLogisticTrack(orderPackage.getLogisticsCode(), orderPackage.getLogisticsNo(), str);
-//            orderPackageVO.setTraces(traces);
+            Traces traces = logisticsService.getLogisticTrack(orderPackage.getLogisticsCode(), orderPackage.getLogisticsNo(), str);
+            orderPackageVO.setTraces(traces);
             orderPackageVOS.add(orderPackageVO);
         });
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
index 1368f7d0..7df0121a 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
@@ -865,7 +865,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         orderPackage.setPackageNo(SnowFlake.createStr("OP"));
         orderPackage.setOrderSn(orderSn);
         orderPackage.setLogisticsNo(invoiceNumber);
-        orderPackage.setLogisticsCode(logistics.getCode());
+        orderPackage.setLogisticsCode(logistics.getId());
         orderPackage.setLogisticsName(logistics.getName());
         orderPackage.setStatus("1");
         orderPackage.setConsigneeMobile(order.getConsigneeMobile());