From 9ca7555ad3b7accc995267ca38a51056102a633b Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Thu, 12 Jun 2025 09:12:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=8F=91=E8=B4=A7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20bug=20=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E4=B8=8B=E5=8D=95=E7=9A=84=E4=B8=80=E4=BA=9B=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/ShopOrderLogisticsServiceImpl.java     | 4 ++--
 .../shop/wechat/service/impl/WxOrderShippingServiceImpl.java  | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderLogisticsServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderLogisticsServiceImpl.java
index 3f15a1d9..927670af 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderLogisticsServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderLogisticsServiceImpl.java
@@ -264,11 +264,11 @@ public class ShopOrderLogisticsServiceImpl extends BaseServiceImpl<ShopOrderLogi
                 Integer kindId = order_info_row.getKind_id();
                 //物流模式，发货方式枚举值：1、实体物流配送采用快递公司进行实体物流配送形式 2、同城配送 3、虚拟商品，虚拟商品，例如话费充值，点卡等，无实体配送形式 4、用户自提
                 Integer logisticsType = 1;
-                if (kindId != null && (kindId.equals(1202) || kindId.equals(1203))) {
+                if (kindId != null && (kindId.equals(StateCode.PRODUCT_KIND_FUWU) || kindId.equals(StateCode.PRODUCT_KIND_CARD))) {
                     logisticsType = 3;
                 }
 
-                if (deliveryType != null && deliveryType.equals(5)) {
+                if (deliveryType != null && deliveryType.equals(StateCode.DELIVERY_TYPE_SELF_PICK_UP)) {
                     logisticsType = 4;
                 }
 
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/wechat/service/impl/WxOrderShippingServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/wechat/service/impl/WxOrderShippingServiceImpl.java
index 65737444..4c3e2369 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/wechat/service/impl/WxOrderShippingServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/wechat/service/impl/WxOrderShippingServiceImpl.java
@@ -124,7 +124,6 @@ public class WxOrderShippingServiceImpl implements WxOrderShippingService {
             shippingItem.putOpt("contact", new JSONObject()
                     .set("receiver_contact", receiverContact));
 
-
             // Step 4: Prepare request payload
             JSONArray shippingList = new JSONArray().put(shippingItem);
 //            String mchId = orderBaseInfo.getMch_id();