From d4810cc87047026b31a3de1383688e4ef07be67e Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 14 Nov 2018 15:45:20 +0800
Subject: [PATCH] - enable enableEbaiStoreWrite on prod - comment all ebai
 order write funcs.

---
 business/partner/purchase/ebai/order.go | 44 ++++++++++++-------------
 conf/app.conf                           |  1 +
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go
index 7d6d8835b..9c07bc7cb 100644
--- a/business/partner/purchase/ebai/order.go
+++ b/business/partner/purchase/ebai/order.go
@@ -10,7 +10,6 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/partner"
-	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
@@ -116,28 +115,28 @@ func (p *PurchaseHandler) GetOrder(vendorOrderID string) (order *model.GoodsOrde
 }
 
 func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) {
-	if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
-		if isAcceptIt {
-			err = api.EbaiAPI.OrderConfirm(order.VendorOrderID)
-		} else {
-			err = api.EbaiAPI.OrderCancel(order.VendorOrderID, ebaiapi.CancelTypeCustom, "bu")
-		}
-	}
+	// if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
+	// 	if isAcceptIt {
+	// 		err = api.EbaiAPI.OrderConfirm(order.VendorOrderID)
+	// 	} else {
+	// 		err = api.EbaiAPI.OrderCancel(order.VendorOrderID, ebaiapi.CancelTypeCustom, "bu")
+	// 	}
+	// }
 	return err
 }
 
 func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, userName string) (err error) {
-	if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
-		err = api.EbaiAPI.OrderCallDelivery(order.VendorOrderID)
-	}
+	// if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
+	// 	err = api.EbaiAPI.OrderCallDelivery(order.VendorOrderID)
+	// }
 	return err
 }
 
 // 将订单从购物平台配送转为自送
 func (p *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) {
-	if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
-		err = api.EbaiAPI.OrderSwitchselfdelivery(order.VendorOrderID)
-	}
+	// if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
+	// 	err = api.EbaiAPI.OrderSwitchselfdelivery(order.VendorOrderID)
+	// }
 	return err
 }
 
@@ -149,17 +148,17 @@ func (p *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName
 
 // 完全自送的门店表示开始配送
 func (p *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) {
-	if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
-		err = api.EbaiAPI.OrderSendOut(order.VendorOrderID, userName)
-	}
+	// if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
+	// 	err = api.EbaiAPI.OrderSendOut(order.VendorOrderID, userName)
+	// }
 	return err
 }
 
 // 完全自送的门店表示配送完成
 func (p *PurchaseHandler) SelfDeliverDelievered(order *model.GoodsOrder, userName string) (err error) {
-	if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
-		err = api.EbaiAPI.OrderComplete(order.VendorOrderID, userName)
-	}
+	// if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
+	// 	err = api.EbaiAPI.OrderComplete(order.VendorOrderID, userName)
+	// }
 	return err
 }
 
@@ -187,8 +186,7 @@ func (c *PurchaseHandler) onOrderNew(msg *ebaiapi.CallbackMsg) (response *ebaiap
 }
 
 func (c *PurchaseHandler) callbackMsg2Status(msg *ebaiapi.CallbackMsg) *model.OrderStatus {
-	body := msg.Body
-	vendorStatus := utils.Int64ToStr(utils.MustInterface2Int64(body["status"]))
+	vendorStatus := utils.Int64ToStr(utils.MustInterface2Int64(msg.Body["status"]))
 	orderID := GetOrderIDFromMsg(msg)
 	orderStatus := &model.OrderStatus{
 		VendorOrderID:    orderID,
@@ -199,7 +197,7 @@ func (c *PurchaseHandler) callbackMsg2Status(msg *ebaiapi.CallbackMsg) *model.Or
 		VendorStatus:     vendorStatus,
 		Status:           c.GetStatusFromVendorStatus(vendorStatus),
 		StatusTime:       utils.Timestamp2Time(msg.Timestamp),
-		Remark:           utils.Interface2String(body["reason"]),
+		Remark:           utils.Interface2String(msg.Body["reason"]),
 	}
 	return orderStatus
 }
diff --git a/conf/app.conf b/conf/app.conf
index 78d211840..2b6c0c824 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -82,6 +82,7 @@ weixinSecret = "6bbbed1443cc062c20a015a64c07a531"
 dbConnectStr = "root:WebServer@1@tcp(db1.int.jxc4.com:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true"
 
 enableStoreWrite = true
+enableEbaiStoreWrite = true
 
 [prod2]
 httpport = 8082