From bdef8c5bb251d2e5ffc0538415e307faa2abfcde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 19 Mar 2020 11:29:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E8=BF=90=E5=8D=95=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E5=91=98=E6=9B=B4=E6=96=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/misc/misc.go                 | 2 +-
 business/partner/purchase/jx/localjx/order.go | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 959eedd11..14e2ad460 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -321,7 +321,7 @@ func doDailyWork() {
 	cms.CurVendorSync.SyncStore2(jxcontext.AdminCtx, dao.GetDB(), nil, nil, true, true)
 
 	syncStoreSku()
-
+	localjx.RefreshAllMatterOrderStatus()
 	InitEx()
 
 	// 每天补全前一天与当天的订单
diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 3f9e0976d..efc8f3347 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -771,7 +771,6 @@ func jxOrder2GoodsOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, deliveryAd
 		order.FromStoreID = jxOrder.FromStoreID
 		order.WaybillVendorID = model.VendorIDJDWL
 		order.DeliveryFlag = model.OrderDeliveryFlagMaskScheduleDisabled
-		order.DeliveryType = model.OrderDeliveryTypeSelfTake
 		order.Flag = 1
 	}
 	return order, err
@@ -808,6 +807,8 @@ func orderSolutionForWuLiao(order *model.GoodsOrder) (err error) {
 		if err != nil || len(goods) == 0 {
 			return err
 		}
+		order.WaybillVendorID = model.VendorIDJDWL
+		dao.UpdateEntity(db, order, "WaybillVendorID")
 		orderSkus := goods[0].Skus
 		if order.Weight <= 5000 { //如果总重量小于5kg就直接发单
 			var (
@@ -845,7 +846,6 @@ func orderSolutionForWuLiao(order *model.GoodsOrder) (err error) {
 			}
 			order.EclpOutID = result
 			dao.UpdateEntity(db, order, "EclpOutID")
-			globals.SugarLogger.Debugf("tryToSplitMatterOrderaaa,[%v]", utils.Format4Output(order, false))
 			waybill := &model.Waybill{
 				VendorOrderID:     order.VendorOrderID,
 				OrderVendorID:     model.VendorIDJX,
@@ -1343,6 +1343,7 @@ func GetMatterOrderStatus(ctx *jxcontext.Context, vendorOrderID string) (result
 			waybillCode = getTrackMessagePlusByOrderResult.ResultData[0].WaybillCode
 			cName       string
 			cMobile     string
+			waybills    []*model.Waybill
 		)
 		for _, vv := range getTrackMessagePlusByOrderResult.ResultData {
 			if vv.OpeTitle == "配送员收货" {
@@ -1352,7 +1353,9 @@ func GetMatterOrderStatus(ctx *jxcontext.Context, vendorOrderID string) (result
 				break
 			}
 		}
-		waybills, _ := dao.GetWayBillByOrderID(db, -1, model.VendorIDJX, -1, vendorOrderID)
+		sql := "SELECT * FROM waybill WHERE vendor_order_id = ?"
+		sqlParams := []interface{}{vendorOrderID}
+		err = dao.GetRows(db, &waybills, sql, sqlParams)
 		if len(waybills) > 0 {
 			waybills[0].VendorWaybillID = waybillCode
 			waybills[0].CourierName = cName