From b58adf14617cd852296bec9e1ca57978741c9f0a Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 20 Apr 2021 01:12:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/tools/WxShopOrderUtil.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/tools/WxShopOrderUtil.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/tools/WxShopOrderUtil.java
index f1694d6..1916ac4 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/tools/WxShopOrderUtil.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/tools/WxShopOrderUtil.java
@@ -225,6 +225,7 @@
shopDeliveryInfo.setUserId(shopOrder.getUserId());
shopDeliveryInfo.setDeliveryWay(shippingMethod);
shopDeliveryInfo.setShopId(shopOrder.getStoreId().longValue());
+ shopDeliveryInfo.setCompanyId(shopOrder.getCompanyId());
StringBuffer receiveAddrStr = new StringBuffer();
if (receiveAddress != null) {
receiveAddrStr.append(receiveAddress.getAddrProvince());
--
Gitblit v1.9.1