From 25177457bb937b735210f33f880b71d234da7525 Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 15 May 2019 09:40:57 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E6=B8=85=E7=90=86=E4=BA=AC=E4=B8=9C?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8API=E7=9A=84=E4=B8=80=E4=BA=9B=E5=B0=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platformapi/jdapi/order_test.go | 2 +- platformapi/jdapi/promotion_audit.go | 5 ++++ platformapi/jdapi/promotion_audit_test.go | 4 +-- platformapi/jdapi/promotion_order.go | 12 ++++---- platformapi/jdapi/promotion_order_test.go | 25 +++++++++-------- platformapi/jdapi/promotion_sku_test.go | 34 ++++++++--------------- 6 files changed, 40 insertions(+), 42 deletions(-) diff --git a/platformapi/jdapi/order_test.go b/platformapi/jdapi/order_test.go index d1b18f0b..972af839 100644 --- a/platformapi/jdapi/order_test.go +++ b/platformapi/jdapi/order_test.go @@ -81,7 +81,7 @@ func TestGetOrderApplyCancelCallbackMsg(t *testing.T) { func TestSimulateSendNewOrderMsg(t *testing.T) { orderInfo := &CallbackOrderMsg{ BillID: "813344594000041", - StatusID: OrderStatusNew, + StatusID: OrderStatusPurchased, Timestamp: utils.GetCurTimeStr(), } params := make(url.Values) diff --git a/platformapi/jdapi/promotion_audit.go b/platformapi/jdapi/promotion_audit.go index 0d77a0f2..e993891f 100644 --- a/platformapi/jdapi/promotion_audit.go +++ b/platformapi/jdapi/promotion_audit.go @@ -73,6 +73,9 @@ type PromotionLspQueryInfoResult struct { Source string `json:"source"` } +// 此接口逐渐会被[新版订单级促销]中相应接口替换 +// 根据到家活动ID查询订单级活动明细接口 +// https://openo2o.jddj.com/staticnew/widgets/resources.html?groupid=196&apiid=ff1ade31ac1b4a50be760854c777b567 func (a *API) OrderDiscountQueryActivityInfoById(activityID int64, promotionType, state int, operator string) (response *OpenPlatActivityQResponse, err error) { params := map[string]interface{}{ "activityId": activityID, @@ -91,6 +94,8 @@ func (a *API) OrderDiscountQueryActivityInfoById(activityID int64, promotionType return response, err } +// 根据到家活动ID查询单品级促销活动接口 +// https://openo2o.jddj.com/staticnew/widgets/resources.html?groupid=196&apiid=a47520a9757f4b0dbac1e6d36fd1103d func (a *API) QueryPromotionInfo(promotionInfoId int64) (promotionInfo *PromotionLspQueryInfoResult, err error) { jdParams := map[string]interface{}{ "promotionInfoId": promotionInfoId, diff --git a/platformapi/jdapi/promotion_audit_test.go b/platformapi/jdapi/promotion_audit_test.go index 1c443405..b1b670f9 100644 --- a/platformapi/jdapi/promotion_audit_test.go +++ b/platformapi/jdapi/promotion_audit_test.go @@ -14,8 +14,8 @@ func TestOrderDiscountQueryActivityInfoById(t *testing.T) { t.Log(utils.Format4Output(result, false)) } -func TestQueryPromotionInfo2(t *testing.T) { - result, err := api.QueryPromotionInfo2(43430316) +func TestQueryPromotionInfo(t *testing.T) { + result, err := api.QueryPromotionInfo(43430316) if err != nil { t.Fatal(err) } diff --git a/platformapi/jdapi/promotion_order.go b/platformapi/jdapi/promotion_order.go index 7dc500cb..c250068e 100644 --- a/platformapi/jdapi/promotion_order.go +++ b/platformapi/jdapi/promotion_order.go @@ -4,6 +4,8 @@ import ( "git.rosy.net.cn/baseapi/utils" ) +// 新版订单级促销 + const ( OrderDiscountActivityTypeManJian = 1 // 满减 OrderDiscountActivityTypeHuanGou = 1202 // 换购 @@ -42,11 +44,11 @@ type OrderDiscountActivity struct { ParticipationMode int `json:"participationMode"` // 必须 OutStationNos []string `json:"outStationNos,omitempty"` StationNos []string `json:"stationNos,omitempty"` - OutSkuIds []string `json:"outSkuIds,omitempty"` - SkuIds []string `json:"skuIds,omitempty"` - LimitOrderTotalNumber int `json:"limitOrderTotalNumber"` // 必须 - LimitUserTotalNumber int `json:"limitUserTotalNumber,omitempty"` - Display string `json:"display"` // 必须 + OutSkuIDs []string `json:"outSkuIds,omitempty"` + SkuIDs []string `json:"skuIds,omitempty"` + LimitOrderTotalNumber int `json:"limitOrderTotalNumber"` // 必须, 活动限购单量(0为不限，不超过10万) + LimitUserTotalNumber int `json:"limitUserTotalNumber,omitempty"` // 用户限购单量(0为不限，不超过100，仅满减和每满减有效) + Display string `json:"display"` // 必须 RuleRequestList []*OrderDiscountRuleRequest `json:"ruleRequestList,omitempty"` } diff --git a/platformapi/jdapi/promotion_order_test.go b/platformapi/jdapi/promotion_order_test.go index 1ad3f196..56a1f3bd 100644 --- a/platformapi/jdapi/promotion_order_test.go +++ b/platformapi/jdapi/promotion_order_test.go @@ -9,15 +9,16 @@ import ( func TestOrderDiscountSubmitActivity(t *testing.T) { actInfo := &OrderDiscountActivity{ - OutActivityID: utils.GetUUID(), - PromName: "测试0404", - PromType: OrderDiscountActivityTypeManJian, - BeginTime: utils.Time2Str(time.Now().Add(1 * time.Hour)), - EndTime: utils.Time2Str(time.Now().Add(48 * time.Hour)), - ParticipationMode: ParticipationModeAllSku, - Display: "hello", - OutStationNos: []string{"25"}, - OutSkuIds: []string{"5199"}, + OutActivityID: utils.GetUUID(), + PromName: "测试0404", + PromType: OrderDiscountActivityTypeManJian, + BeginTime: utils.Time2Str(time.Now().Add(1 * time.Hour)), + EndTime: utils.Time2Str(time.Now().Add(48 * time.Hour)), + ParticipationMode: ParticipationModeAllSku, + Display: "hello", + OutStationNos: []string{"2"}, + // OutSkuIDs: []string{"5199"}, + SkuIDs: []string{"2023747677"}, LimitUserTotalNumber: 1, RuleRequestList: []*OrderDiscountRuleRequest{ &OrderDiscountRuleRequest{ @@ -35,7 +36,7 @@ func TestOrderDiscountSubmitActivity(t *testing.T) { } func TestOrderDiscountQuerySubmitActivityResult(t *testing.T) { - result, err := api.OrderDiscountQuerySubmitActivityResult(10000044) + result, err := api.OrderDiscountQuerySubmitActivityResult(10000048) if err != nil { t.Fatal(err) } @@ -43,7 +44,7 @@ func TestOrderDiscountQuerySubmitActivityResult(t *testing.T) { } func TestOrderDiscountQueryActivityInfo(t *testing.T) { - result, err := api.OrderDiscountQueryActivityInfo(10000044) + result, err := api.OrderDiscountQueryActivityInfo(10000046) if err != nil { t.Fatal(err) } @@ -51,7 +52,7 @@ func TestOrderDiscountQueryActivityInfo(t *testing.T) { } func TestOrderDiscountCancelActivity(t *testing.T) { - err := api.OrderDiscountCancelActivity(10000044, "test", "") + err := api.OrderDiscountCancelActivity(10000046, "test", "") if err != nil { t.Fatal(err) } diff --git a/platformapi/jdapi/promotion_sku_test.go b/platformapi/jdapi/promotion_sku_test.go index a71be83a..ffcef95d 100644 --- a/platformapi/jdapi/promotion_sku_test.go +++ b/platformapi/jdapi/promotion_sku_test.go @@ -15,12 +15,12 @@ func TestCreatePromotionSingle(t *testing.T) { if err != nil { t.Fatal(err) } - skuInfos, err := api.CreatePromotionSkuSingle(infoId, "", []map[string]interface{}{ - { - KeyOutSkuId: "2216", - KeyStationNo: 11682042, - KeyPromotionPrice: 500, - KeyLimitSkuCount: 2, + skuInfos, err := api.CreatePromotionSkuSingle(infoId, "", []*PromotionSku{ + &PromotionSku{ + OutSkuID: "2216", + StationNo: 11682042, + PromotionPrice: 500, + LimitSkuCount: 2, }, }) if err != nil { @@ -43,12 +43,12 @@ func TestCreatePromotionLimitTime(t *testing.T) { if err != nil { t.Fatal(err) } - skuInfos, err := api.CreatePromotionSkuLimitTime(infoId, "", []map[string]interface{}{ - { - KeyOutSkuId: "2216", - KeyStationNo: 11682042, - KeyPromotionPrice: 300, - KeyLimitSkuCount: 2, + skuInfos, err := api.CreatePromotionSkuLimitTime(infoId, "", []*PromotionSku{ + &PromotionSku{ + OutSkuID: "2216", + StationNo: 11682042, + PromotionPrice: 300, + LimitSkuCount: 2, }, }) if err != nil { @@ -60,13 +60,3 @@ func TestCreatePromotionLimitTime(t *testing.T) { t.Fatal(err) } } - -func TestQueryPromotionInfo(t *testing.T) { - result, err := api.QueryPromotionInfo(14885272) - if err != nil { - t.Fatal(err) - } - if len(result.SkuResultList) == 0 { - t.Fatal("should have SkuResultList") - } -}