- reorganize purchase platform interface, split Swith2SelfDeliver and SelfDelivery.

business/controller/elm/order.go

@@ -268,12 +268,14 @@ func (c *OrderController) PickupGoods(order *model.GoodsOrder) (err error) {
 
 func (c *OrderController) Swtich2SelfDeliver(order *model.GoodsOrder) (err error) {
 	err = api.ElmAPI.DeliveryBySelfLite(order.VendorOrderID)
-	// todo 饿了么订单转自送后，不会自动处于配送中状态（而京东平台就会），主动调用一个这个接口，这样使用是不确定的。
-	// 参见：https://open.shop.ele.me/openapi/onlineqa/detail/c128392dd92a4d6a9af738ea5e6c6df9，这个回复也不清楚
-	c.SelfDeliverDelievering(order)
 	return err
 }
 
+// 饿了么转商家自送后，没有确认送达的概念，空操作
+func (c *OrderController) Swtich2SelfDelivered(order *model.GoodsOrder) (err error) {
+	return nil
+}
+
 func (c *OrderController) SelfDeliverDelievering(order *model.GoodsOrder) (err error) {
 	return api.ElmAPI.StartDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile)
 }

business/controller/jd/order.go

@@ -214,12 +214,17 @@ func (c *OrderController) Swtich2SelfDeliver(order *model.GoodsOrder) (err error
 	return err
 }
 
+func (c *OrderController) Swtich2SelfDelivered(order *model.GoodsOrder) (err error) {
+	_, err = api.JdAPI.DeliveryEndOrder(order.VendorOrderID)
+	return err
+}
+
 func (c *OrderController) SelfDeliverDelievering(order *model.GoodsOrder) (err error) {
 	_, err = api.JdAPI.OrderSerllerDelivery(order.VendorOrderID)
 	return err
 }
 
+// 京东送达接口都是一样的
 func (c *OrderController) SelfDeliverDelievered(order *model.GoodsOrder) (err error) {
-	_, err = api.JdAPI.DeliveryEndOrder(order.VendorOrderID)
-	return err
+	return c.Swtich2SelfDelivered(order)
 }