From 6952ca3bf0f6287336503e2931d905481a8e4c93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 5 Jun 2020 11:03:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=A2=9E=E5=8A=A0=E6=80=BB?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/sku.go                     |  3 ++-
 business/partner/purchase/jdshop/order.go | 28 +++++++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/business/model/sku.go b/business/model/sku.go
index 25c31e894..6d1a8e8fb 100644
--- a/business/model/sku.go
+++ b/business/model/sku.go
@@ -184,7 +184,8 @@ type SkuName struct {
 	// JdSyncStatus int8  `orm:"default(2)" json:"jdSyncStatus"`
 
 	// LinkID int `orm:"column(link_id);null;index" json:"linkID"`
-	YbNameSuffix string `json:"ybNameSuffix"` //银豹商品后缀
+	YbNameSuffix   string `json:"ybNameSuffix"` //银豹商品后缀
+	JdsStockSwitch int8   `orm:"default(1)" json:"jdsStockSwitch"`
 }
 
 func (*SkuName) TableUnique() [][]string {
diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go
index ec03a1324..7b37f7363 100644
--- a/business/partner/purchase/jdshop/order.go
+++ b/business/partner/purchase/jdshop/order.go
@@ -41,7 +41,12 @@ func (p *PurchaseHandler) GetOrder(vendorOrgCode, vendorOrderID string) (order *
 	return p.Map2Order(utils.Struct2FlatMap(resultOrders)), err
 }
 func (p *PurchaseHandler) GetOrderStatus(vendorOrgCode, vendorOrderID string) (status int, err error) {
-	return status, err
+	orderResult, err := api.JdShopAPI.AllOrders(&jdshopapi.AllOrdersParam{
+		OrderID:  vendorOrderID,
+		Current:  1,
+		PageSize: 1,
+	})
+	return status2Jxstatus(orderResult.OrderList[0].OrderStatus), err
 }
 
 func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) {
@@ -54,7 +59,13 @@ func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
 	return ChangeOrderStatus(order.VendorOrderID, status, "")
 }
 func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) {
-	err = ChangeOrderStatus(order.VendorOrderID, model.OrderStatusFinishedPickup, "")
+	status, err := p.GetOrderStatus("", order.VendorOrderID2)
+	//说明此时该订单在平台上已经取消了
+	if status == model.OrderStatusApplyCancel {
+		err = ChangeOrderStatus(order.VendorOrderID, model.OrderStatusFinishedPickup, "自动拣货完成")
+	} else {
+		err = ChangeOrderStatus(order.VendorOrderID, model.OrderStatusCanceled, "订单状态发生了改变")
+	}
 	return err
 }
 
@@ -153,3 +164,16 @@ func (p *PurchaseHandler) OrderTransfer(ctx *jxcontext.Context, vendorOrderID, v
 	err = api.JdShopAPI.UpdateWaybill(vendorOrderID[:12], companyID, vendorWaybillID)
 	return err
 }
+
+func status2Jxstatus(status int) (statusJx int) {
+	if status == jdshopapi.JdsOrderStatusWaittingPay {
+		statusJx = model.OrderStatusWait4Pay
+	} else if status == jdshopapi.JdsOrderStatusWaittingPayDel {
+		statusJx = model.OrderStatusApplyCancel
+	} else if status == jdshopapi.JdsOrderStatusWaittingExport {
+		statusJx = model.OrderStatusAccepted
+	} else if status == jdshopapi.JdsOrderStatusPause {
+		statusJx = model.OrderStatusNew
+	}
+	return statusJx
+}