京东商城订单补全

business/partner/purchase/jdshop/order.go

@@ -1,11 +1,14 @@
 package jdshop
 
 import (
+	"time"
+
 	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
@@ -42,9 +45,16 @@ func (p *PurchaseHandler) GetOrderStatus(vendorOrgCode, vendorOrderID string) (s
 }
 
 func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) {
-	return err
+	var status int
+	if isAcceptIt {
+		status = model.OrderStatusAccepted
+	} else {
+		status = model.OrderStatusCanceled
+	}
+	return changeOrderStatus(order.VendorOrderID, status, "")
 }
 func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) {
+	err = changeOrderStatus(order.VendorOrderID, model.OrderStatusFinishedPickup, "")
 	return err
 }
 
@@ -105,3 +115,26 @@ func (p *PurchaseHandler) GetJdsOrders(ctx *jxcontext.Context, orderCreatedStart
 	})
 	return orderResult, err
 }
+
+func changeOrderStatus(vendorOrderID string, status int, remark string) (err error) {
+	orderStatus := &model.OrderStatus{
+		VendorOrderID:    vendorOrderID,
+		VendorID:         model.VendorIDJDShop,
+		OrderType:        model.OrderTypeOrder,
+		RefVendorOrderID: vendorOrderID,
+		RefVendorID:      model.VendorIDJDShop,
+		VendorStatus:     utils.Int2Str(status),
+		Status:           status,
+		StatusTime:       time.Now(),
+		Remark:           remark,
+	}
+	jxutils.CallMsgHandlerAsync(func() {
+		err = partner.CurOrderManager.OnOrderStatusChanged("", orderStatus)
+	}, jxutils.ComposeUniversalOrderID(vendorOrderID, model.VendorIDJDShop))
+	return err
+}
+
+func (p *PurchaseHandler) OrderExport(ctx *jxcontext.Context, vendorOrderID, vendorWaybillID string) (err error) {
+	err = api.JdShopAPI.OrderShipment(utils.Str2Int64(vendorOrderID), "", vendorWaybillID)
+	return err
+}