- apis interact with PurchasePlatform added.

business/controller/jd/order.go

@@ -163,10 +163,39 @@ func (c *OrderController) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
 	return err
 }
 
-func (c *OrderController) ForcePickUp(order *model.GoodsOrder) (err error) {
+func (c *OrderController) PickedUpGoods(order *model.GoodsOrder) (err error) {
+	_, err = api.JdAPI.OrderJDZBDelivery(order.VendorOrderID)
+	return c.translateOrderRelatedErr(err)
+}
+
+func (c *OrderController) Swtich2SelfDeliver(order *model.GoodsOrder) (err error) {
+	_, err = api.JdAPI.ModifySellerDelivery(order.VendorOrderID)
+	return c.translateOrderRelatedErr(err)
+}
+
+func (c *OrderController) SelfDeliverPickedUpGoods(order *model.GoodsOrder) (err error) {
+	_, err = api.JdAPI.OrderSerllerDelivery(order.VendorOrderID)
+	return c.translateOrderRelatedErr(err)
+}
+
+// 京东无此操作，直接返回成功
+func (c *OrderController) SelfDeliverDelievering(order *model.GoodsOrder) (err error) {
 	return nil
 }
 
-func (c *OrderController) SwtichSelfDeliver(order *model.GoodsOrder) (err error) {
+func (c *OrderController) SelfDeliverDelievered(order *model.GoodsOrder) (err error) {
+	_, err = api.JdAPI.DeliveryEndOrder(order.VendorOrderID)
+	return err
+}
+
+func (c *OrderController) translateOrderRelatedErr(err error) (retVal error) {
+	if err != nil {
+		if errWithCode, ok := err.(*utils.ErrorWithCode); ok {
+			if errWithCode.Level() == 1 && errWithCode.Code() == jdapi.ResponseInnerCodeOrderAlreadyPickedUp {
+				return nil
+			}
+		}
+		return scheduler.ErrStatusIsNotOKForOperation
+	}
 	return nil
 }