From 132e30d89f3d30f6c44c2aa0a93f0218a92cf199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 8 Jul 2020 13:56:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E9=85=8D=E9=80=81=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E7=B1=BB=E5=9E=8B=E9=80=89=E7=89=B9=E6=83=A0=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/misc/misc.go               |  2 +-
 business/partner/delivery/jdeclp/waybill.go | 29 +++++++++++----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index c7f20be56..aedde0842 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -354,7 +354,7 @@ func syncStoreSku() {
 					})
 				errList.AddErr(err)
 
-				_, err = cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, nil, 0, db, partner.GetMultiStoreVendorIDs(), nil, false, nil, []int{27379}, syncFlag, true, true)
+				_, err = cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, nil, 0, db, []int{0}, nil, false, nil, []int{27379}, syncFlag, true, true)
 				// _, err = cms.CurVendorSync.FullSyncStoresSkus(jxcontext.AdminCtx, db, partner.GetMultiStoreVendorIDs(), nil, false, []int{27379}, true, true)
 				errList.AddErr(err)
 			case 1:
diff --git a/business/partner/delivery/jdeclp/waybill.go b/business/partner/delivery/jdeclp/waybill.go
index 7015c38b6..c88bf0b47 100644
--- a/business/partner/delivery/jdeclp/waybill.go
+++ b/business/partner/delivery/jdeclp/waybill.go
@@ -56,20 +56,21 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
 		return bill, fmt.Errorf("未查询到该门店！ 门店id ：[%v]", storeID)
 	}
 	vendorWaybillID, err := api.JdEclpAPI.WaybillReceive(&jdeclpapi.WaybillReceiveParam{
-		SalePlat:       jdeclpapi.SalePlatSourceDelivery,
-		CustomerCode:   jdeclpapi.CustomerCode,
-		OrderID:        order.VendorOrderID,
-		SenderName:     order.StoreName,
-		SenderAddress:  stores[0].Address,
-		SenderTel:      stores[0].Tel1,
-		ReceiveName:    order.ConsigneeName,
-		ReceiveAddress: order.ConsigneeAddress,
-		ReceiveTel:     order.ConsigneeMobile,
-		Weight:         order.Weight,
-		Vloumn:         order.Weight,
-		PackageCount:   1,
-		Description:    "生鲜",
-		Aging:          5,
+		SalePlat:        jdeclpapi.SalePlatSourceDelivery,
+		CustomerCode:    jdeclpapi.CustomerCode,
+		OrderID:         order.VendorOrderID,
+		SenderName:      order.StoreName,
+		SenderAddress:   stores[0].Address,
+		SenderTel:       stores[0].Tel1,
+		ReceiveName:     order.ConsigneeName,
+		ReceiveAddress:  order.ConsigneeAddress,
+		ReceiveTel:      order.ConsigneeMobile,
+		Weight:          order.Weight,
+		Vloumn:          order.Weight,
+		PackageCount:    1,
+		Description:     "生鲜",
+		Aging:           5,
+		PromiseTimeType: 1, //特惠送
 	})
 	waybill := &model.Waybill{
 		VendorOrderID:     order.VendorOrderID,