- correct implementation of AddOrderAfterQuery

platformapi/dadaapi/order.go

@@ -46,6 +46,7 @@ type OperateOrderRequiredParams struct {
 }
 
 type CreateOrderResponse struct {
+	DeliveryNo   string
 	Distance     float64
 	Fee          float64
 	DeliverFee   float64
@@ -73,6 +74,7 @@ func map2CreateOrderResponse(mapData map[string]interface{}) *CreateOrderRespons
 	retVal.Distance = utils.MustInterface2Float64(mapData["distance"])
 	retVal.Fee = utils.MustInterface2Float64(mapData["fee"])
 	retVal.DeliverFee = utils.MustInterface2Float64(mapData["deliverFee"])
+	retVal.DeliveryNo = utils.Interface2String(mapData["deliveryNo"])
 
 	if value, ok := mapData["couponFee"]; ok {
 		retVal.CouponFee = utils.MustInterface2Float64(value)
@@ -109,8 +111,11 @@ func (a *API) QueryDeliverFee(orderInfo *OperateOrderRequiredParams, addParams m
 	return a.operateOrder("api/order/queryDeliverFee", orderInfo, addParams)
 }
 
-func (a *API) AddOrderAfterQuery(orderInfo *OperateOrderRequiredParams, addParams map[string]interface{}) (retVal *CreateOrderResponse, err error) {
+func (a *API) AddOrderAfterQuery(deliveryNo string) (err error) {
-	return a.operateOrder("api/order/addAfterQuery", orderInfo, addParams)
+	_, err = a.AccessAPI("api/order/addAfterQuery", map[string]interface{}{
+		"deliveryNo": deliveryNo,
+	})
+	return err
 }
 
 func (a *API) CancelOrder(thirdPartOrderID string, cancelOrderReasonId int, cancelOrderReason string) (retVal *CancelOrderResponse, err error) {

platformapi/dadaapi/order_test.go

@@ -0,0 +1,47 @@
+package dadaapi
+
+import (
+	"testing"
+
+	"git.rosy.net.cn/baseapi"
+	"git.rosy.net.cn/baseapi/utils"
+)
+
+func TestAddOrderAfterQuery(t *testing.T) {
+	orderID := utils.GetUUID()
+	result, err := dadaapi.QueryDeliverFee(&OperateOrderRequiredParams{
+		ShopNo:          "18180948107",
+		OriginID:        orderID,
+		CityCode:        "028",
+		CargoPrice:      0.01,
+		IsPrepay:        0,
+		ReceiverName:    "徐建华",
+		ReceiverAddress: "西南交通大学科技大厦",
+		ReceiverLng:     104.056822,
+		ReceiverLat:     30.696041,
+		ReceiverPhone:   "18180948107",
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	baseapi.SugarLogger.Debug(utils.Format4Output(result, false))
+
+	err = dadaapi.AddOrderAfterQuery(result.DeliveryNo)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	cancelResponse, err := dadaapi.CancelOrder(orderID, ReasonIDOther, "test")
+	if err != nil {
+		t.Fatal(err)
+	}
+	baseapi.SugarLogger.Debug(utils.Format4Output(cancelResponse, false))
+}
+
+func TestCancel(t *testing.T) {
+	cancelResponse, err := dadaapi.CancelOrder("94065C161F8E11E9AAC8186590E02977", ReasonIDOther, "test")
+	if err != nil {
+		t.Fatal(err)
+	}
+	baseapi.SugarLogger.Debug(utils.Format4Output(cancelResponse, false))
+}

platformapi/dadaapi/shop_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func TestShopDetail(t *testing.T) {
-	result, err := dadaapi.ShopDetail("100119")
+	result, err := dadaapi.ShopDetail("18180948107")
 	if err != nil {
 		t.Fatal(err)
 	}