From e873ce0264cdf3f11ff8e6ca69f290b358c9dcc1 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 10 Sep 2019 17:36:02 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BA=AC=E8=A5=BF=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=87=AA=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scheduler/basesch/basesch_ext.go          | 24 +++++++++++--------
 business/partner/purchase/jx/order.go         | 10 ++++++++
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go
index 5a804f83e..669ee98bf 100644
--- a/business/jxcallback/scheduler/basesch/basesch_ext.go
+++ b/business/jxcallback/scheduler/basesch/basesch_ext.go
@@ -11,6 +11,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/jd"
+	"git.rosy.net.cn/jx-callback/business/partner/purchase/jx"
 	"git.rosy.net.cn/jx-callback/globals"
 )
 
@@ -246,17 +247,20 @@ func (c *BaseScheduler) RefundOrder(ctx *jxcontext.Context, order *model.GoodsOr
 }
 
 func (c *BaseScheduler) ConfirmSelfTake(ctx *jxcontext.Context, vendorOrderID string, vendorID int, selfTakeCode string) (err error) {
-	if vendorID != model.VendorIDJD {
-		return fmt.Errorf("当前只支持%s平台订单", model.VendorChineseNames[model.VendorIDJD])
-	}
-	if selfTakeCode == "135246" {
-		if selfTakeCode, err = jd.CurPurchaseHandler.GetSelfTakeCode(ctx, vendorOrderID); err != nil {
-			return fmt.Errorf("获取订单:%s自提货码失败，原始错误:%s", vendorOrderID, err.Error())
-		}
-		if selfTakeCode == "" {
-			return fmt.Errorf("订单:%s看起来不是一个自提订单，如果确认是自提订单，请联系开发", vendorOrderID)
+	if vendorID == model.VendorIDJD {
+		if selfTakeCode == "135246" {
+			if selfTakeCode, err = jd.CurPurchaseHandler.GetSelfTakeCode(ctx, vendorOrderID); err != nil {
+				return fmt.Errorf("获取订单:%s自提货码失败，原始错误:%s", vendorOrderID, err.Error())
+			}
+			if selfTakeCode == "" {
+				return fmt.Errorf("订单:%s看起来不是一个自提订单，如果确认是自提订单，请联系开发", vendorOrderID)
+			}
 		}
+		err = jd.CurPurchaseHandler.ConfirmSelfTake(ctx, vendorOrderID, selfTakeCode)
+	} else if vendorID == model.VendorIDJX {
+		err = jx.CurPurchaseHandler.ConfirmSelfTake(ctx, vendorOrderID, selfTakeCode)
+	} else {
+		err = fmt.Errorf("自提核销不支持%s平台订单", model.VendorChineseNames[vendorID])
 	}
-	err = jd.CurPurchaseHandler.ConfirmSelfTake(ctx, vendorOrderID, selfTakeCode)
 	return err
 }
diff --git a/business/partner/purchase/jx/order.go b/business/partner/purchase/jx/order.go
index da762c386..94c3b85d2 100644
--- a/business/partner/purchase/jx/order.go
+++ b/business/partner/purchase/jx/order.go
@@ -151,3 +151,13 @@ func (c *PurchaseHandler) GetWaybillTip(ctx *jxcontext.Context, order *model.Goo
 func (c *PurchaseHandler) AddWaybillTip(ctx *jxcontext.Context, order *model.GoodsOrder, tipFee2Add int64) (err error) {
 	return err
 }
+
+func (c *PurchaseHandler) ConfirmSelfTake(ctx *jxcontext.Context, vendorOrderID, selfTakeCode string) (err error) {
+	order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, model.VendorIDJX)
+	if err == nil {
+		order.Status = model.OrderStatusFinished
+		c.postFakeMsg(order.VendorOrderID, order.Status)
+		jxAPI.NotifyOrderStatusChanged(order)
+	}
+	return err
+}