From 55301b09ac1e68bdd081683c4dea9426ecd70460 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 20 Apr 2021 15:31:15 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/tools/WxShopOrderUtil.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 1916ac4..d4d7785 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
@@ -216,14 +216,19 @@
/**
* 新增发货信息
*/
- public int insertSendPackageInfo(ShopOrder shopOrder, String shippingMethod, ShopReceiveAddress receiveAddress) {
+ public int insertSendPackageInfo(ShopOrder shopOrder, Integer shippingMethod, ShopReceiveAddress receiveAddress) {
ShopDeliveryInfo shopDeliveryInfo = new ShopDeliveryInfo();
shopDeliveryInfo.setCreateBy(AppConstance.SYSTEM_USER);
shopDeliveryInfo.setUpdateBy(AppConstance.SYSTEM_USER);
shopDeliveryInfo.setOrderId(shopOrder.getId());
shopDeliveryInfo.setOrderNo(shopOrder.getOrderNo());
shopDeliveryInfo.setUserId(shopOrder.getUserId());
- shopDeliveryInfo.setDeliveryWay(shippingMethod);
+ if(ShopOrder.SHIPPING_METHOD_WL==shippingMethod){
+ shopDeliveryInfo.setDeliveryWay("物流配送");
+ }else{
+ shopDeliveryInfo.setDeliveryWay("门店自提");
+ }
+
shopDeliveryInfo.setShopId(shopOrder.getStoreId().longValue());
shopDeliveryInfo.setCompanyId(shopOrder.getCompanyId());
StringBuffer receiveAddrStr = new StringBuffer();
--
Gitblit v1.9.1