From 0f737cd73e5ef7f687ebd7a1840288cee66302c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 14 Sep 2020 14:59:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B7=E6=96=B0=E4=BA=AC=E4=B8=9C=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go     | 13 +++++++++++++
 business/partner/purchase/jdshop/order.go | 17 +++++++++++------
 controllers/act.go                        |  2 +-
 controllers/jx_order.go                   | 14 ++++++++++++++
 4 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 8b21f6aaa..5abc4ea14 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -1801,3 +1801,16 @@ func GenOrderNo(ctx *jxcontext.Context) (orderNo int64) {
 	orderNo += int64(math.Pow10(int(math.Log10(float64(orderNo)))+1)) * prefix
 	return orderNo
 }
+
+func RefreshJdsOrderConsigneeInfo(ctx *jxcontext.Context, vendorOrderID string) (err error) {
+	var (
+		db = dao.GetDB()
+	)
+	order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, model.VendorIDJDShop)
+	waybill, err := partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID)
+	if waybill != nil {
+		return fmt.Errorf("已经创建了三方运单不允许修改联系人信息！")
+	}
+
+	return err
+}
diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go
index 865d988a9..b97781162 100644
--- a/business/partner/purchase/jdshop/order.go
+++ b/business/partner/purchase/jdshop/order.go
@@ -49,12 +49,7 @@ 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) {
-	params := make(map[string]interface{})
-	params["orderID"] = vendorOrderID
-	params["token"] = "JxCaIsHiGetJsdOrderTmpToken_20200731"
-	result, err := apiToYd("order/GetJdsOrder", params)
-	jdsOrder := &jdshopapi.GetOrderResult{}
-	json.Unmarshal([]byte(strings.ReplaceAll(result["data"].(string), "\\", "")), &jdsOrder)
+	jdsOrder, err := GetJdsOrder(vendorOrderID)
 	return status2Jxstatus(jdsOrder.OrderState), err
 }
 
@@ -236,3 +231,13 @@ func apiToYd(url string, params map[string]interface{}) (retVal map[string]inter
 		})
 	return retVal, err
 }
+
+func GetJdsOrder(vendorOrderID string) (jdsOrder *jdshopapi.GetOrderResult, err error) {
+	params := make(map[string]interface{})
+	params["orderID"] = vendorOrderID
+	params["token"] = jdshopapi.JdsYdToken
+	result, err := apiToYd("order/GetJdsOrder", params)
+	jdsOrder = &jdshopapi.GetOrderResult{}
+	json.Unmarshal([]byte(strings.ReplaceAll(result["data"].(string), "\\", "")), &jdsOrder)
+	return jdsOrder, err
+}
diff --git a/controllers/act.go b/controllers/act.go
index 8fc2c00fa..89e6843a2 100644
--- a/controllers/act.go
+++ b/controllers/act.go
@@ -189,7 +189,7 @@ func (c *ActController) CancelAct() {
 // @Param	pageSize		query		int		false	"表页大小（缺省全部）"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
-// @router /GetActStoreSkuInfo [get]
+// @router /GetActStoreSkuInfo [get,post]
 func (c *ActController) GetActStoreSkuInfo() {
 	c.callGetActStoreSkuInfo(func(params *tActGetActStoreSkuInfoParams) (retVal interface{}, errCode string, err error) {
 		var vendorIDs []int
diff --git a/controllers/jx_order.go b/controllers/jx_order.go
index 3bcf028cc..d88564eae 100644
--- a/controllers/jx_order.go
+++ b/controllers/jx_order.go
@@ -1168,3 +1168,17 @@ func (c *OrderController) AcceptOrRefuseOrder() {
 		return retVal, "", err
 	})
 }
+
+// @Title 刷新京东商城订单收货人信息
+// @Description 刷新京东商城订单收货人信息
+// @Param	token			header		string	true	"认证token"
+// @Param	vendorOrderID	formData	string	true	"订单ID"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /RefreshJdsOrderConsigneeInfo [put]
+func (c *OrderController) RefreshJdsOrderConsigneeInfo() {
+	c.callRefreshJdsOrderConsigneeInfo(func(params *tOrderRefreshJdsOrderConsigneeInfoParams) (retVal interface{}, errCode string, err error) {
+		err = orderman.RefreshJdsOrderConsigneeInfo(params.Ctx, params.VendorOrderID)
+		return retVal, "", err
+	})
+}