From ee8f34261745dbdd24069a82557ac22c08650255 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, 14 Oct 2020 16:05:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B7=E6=96=B0=E7=89=A9=E6=96=99=E5=93=A6?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 9c2cb8b85..e8f813765 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -418,6 +418,8 @@ func doDailyWork2() {
 	cms.CurVendorSync.SyncJdsStoresSkus(jxcontext.AdminCtx, nil, true, true)
 	//刷新京东商城的门店库存
 	cms.SyncJdsStoreStock(jxcontext.AdminCtx, true, true)
+	//刷新京东商城订单结算价
+	orderman.RefreshJdShopOrdersEarningPrice(jxcontext.AdminCtx, time.Now().AddDate(0, 0, -2).Format("20060102"), time.Now().Format("20060102"))
 }
 
 func doDailyWork() {
@@ -451,8 +453,6 @@ func doDailyWork() {
 	localjx.RefreshAllMatterOrderStatus(jxcontext.AdminCtx)
 	//同步银豹到京西
 	// cms.CurVendorSync.SyncStoreSkusFromYb(jxcontext.AdminCtx, nil, true, true)
-	//刷新京东商城订单结算价
-	orderman.RefreshJdShopOrdersEarningPrice(jxcontext.AdminCtx, time.Now().AddDate(0, 0, -2).Format("20060102"), time.Now().Format("20060102"))
 	//同步上架京东商城待售商品
 	cms.RefreshJdsSkusStatus(jxcontext.AdminCtx)
 	//同步美团配送与否状态及美团门店是否存在
diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index c00cf41c5..238a264f4 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -1642,26 +1642,28 @@ func RefreshAllMatterOrderStatus(ctx *jxcontext.Context) (err error) {
 					cancelCount++
 				}
 			}
-			dao.Begin(db)
-			defer func() {
-				if r := recover(); r != nil {
-					dao.Rollback(db)
-					panic(r)
+			if len(goodsList2) > 0 {
+				dao.Begin(db)
+				defer func() {
+					if r := recover(); r != nil {
+						dao.Rollback(db)
+						panic(r)
+					}
+				}()
+				if deliveringCount == 0 {
+					v.Status = model.OrderStatusFinished
+				} else {
+					if cancelCount == len(goodsList2) {
+						v.Status = model.OrderStatusCanceled
+					}
 				}
-			}()
-			if deliveringCount == 0 {
-				v.Status = model.OrderStatusFinished
-			} else {
-				if cancelCount == len(goodsList2) {
+				if v.Status < model.OrderStatusDelivering {
 					v.Status = model.OrderStatusCanceled
 				}
+				dao.UpdateEntity(db, v, "Status")
+				dao.Commit(db)
+				changeOrderStatus(v.VendorOrderID, v.Status, "")
 			}
-			if v.Status < model.OrderStatusDelivering {
-				v.Status = model.OrderStatusCanceled
-			}
-			dao.UpdateEntity(db, v, "Status")
-			dao.Commit(db)
-			changeOrderStatus(v.VendorOrderID, v.Status, "")
 		} else {
 			queryOrderStatus, _ := api.JdEclpAPI.QueryOrderStatus(v.EclpOutID)
 			getTrackMessagePlusByOrderResult, _ := api.JdEclpAPI.GetTrackMessagePlusByOrder(v.VendorOrderID)