liulei/baseapi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- 清理京东活动API的一些小问题

Browse Source
This commit is contained in:
gazebo
2019-05-15 09:40:57 +08:00
parent a42516c76e
commit 25177457bb
6 changed files with 40 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platformapi/jdapi/order_test.go
View File

@@ -81,7 +81,7 @@ func TestGetOrderApplyCancelCallbackMsg(t *testing.T) {
func TestSimulateSendNewOrderMsg(t *testing.T) { func TestSimulateSendNewOrderMsg(t *testing.T) {
orderInfo := &CallbackOrderMsg{ orderInfo := &CallbackOrderMsg{
BillID: "813344594000041", BillID: "813344594000041",
StatusID: OrderStatusNew, StatusID: OrderStatusPurchased,
Timestamp: utils.GetCurTimeStr(), Timestamp: utils.GetCurTimeStr(),
} }
params := make(url.Values) params := make(url.Values)

5
platformapi/jdapi/promotion_audit.go
View File

@@ -73,6 +73,9 @@ type PromotionLspQueryInfoResult struct {
Source string `json:"source"` 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) { func (a *API) OrderDiscountQueryActivityInfoById(activityID int64, promotionType, state int, operator string) (response *OpenPlatActivityQResponse, err error) {
params := map[string]interface{}{ params := map[string]interface{}{
"activityId": activityID, "activityId": activityID,
@@ -91,6 +94,8 @@ func (a *API) OrderDiscountQueryActivityInfoById(activityID int64, promotionType
return response, err 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) { func (a *API) QueryPromotionInfo(promotionInfoId int64) (promotionInfo *PromotionLspQueryInfoResult, err error) {
jdParams := map[string]interface{}{ jdParams := map[string]interface{}{
"promotionInfoId": promotionInfoId, "promotionInfoId": promotionInfoId,

4
platformapi/jdapi/promotion_audit_test.go
View File

@@ -14,8 +14,8 @@ func TestOrderDiscountQueryActivityInfoById(t *testing.T) {
t.Log(utils.Format4Output(result, false)) t.Log(utils.Format4Output(result, false))
} }
func TestQueryPromotionInfo2(t *testing.T) { func TestQueryPromotionInfo(t *testing.T) {
result, err := api.QueryPromotionInfo2(43430316) result, err := api.QueryPromotionInfo(43430316)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

12
platformapi/jdapi/promotion_order.go
View File

@@ -4,6 +4,8 @@ import (
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
) )
// 新版订单级促销
const ( const (
OrderDiscountActivityTypeManJian = 1 // 满减 OrderDiscountActivityTypeManJian = 1 // 满减
OrderDiscountActivityTypeHuanGou = 1202 // 换购 OrderDiscountActivityTypeHuanGou = 1202 // 换购
@@ -42,11 +44,11 @@ type OrderDiscountActivity struct {
ParticipationMode int `json:"participationMode"` // 必须 ParticipationMode int `json:"participationMode"` // 必须
OutStationNos []string `json:"outStationNos,omitempty"` OutStationNos []string `json:"outStationNos,omitempty"`
StationNos []string `json:"stationNos,omitempty"` StationNos []string `json:"stationNos,omitempty"`
OutSkuIds []string `json:"outSkuIds,omitempty"` OutSkuIDs []string `json:"outSkuIds,omitempty"`
SkuIds []string `json:"skuIds,omitempty"` SkuIDs []string `json:"skuIds,omitempty"`
LimitOrderTotalNumber int `json:"limitOrderTotalNumber"` // 必须 LimitOrderTotalNumber int `json:"limitOrderTotalNumber"` // 必须, 活动限购单量(0为不限，不超过10万)
LimitUserTotalNumber int `json:"limitUserTotalNumber,omitempty"` LimitUserTotalNumber int `json:"limitUserTotalNumber,omitempty"` // 用户限购单量(0为不限，不超过100，仅满减和每满减有效)
Display string `json:"display"` // 必须 Display string `json:"display"` // 必须
RuleRequestList []*OrderDiscountRuleRequest `json:"ruleRequestList,omitempty"` RuleRequestList []*OrderDiscountRuleRequest `json:"ruleRequestList,omitempty"`
} }

25
platformapi/jdapi/promotion_order_test.go
View File

@@ -9,15 +9,16 @@ import (
func TestOrderDiscountSubmitActivity(t *testing.T) { func TestOrderDiscountSubmitActivity(t *testing.T) {
actInfo := &OrderDiscountActivity{ actInfo := &OrderDiscountActivity{
OutActivityID: utils.GetUUID(), OutActivityID: utils.GetUUID(),
PromName: "测试0404", PromName: "测试0404",
PromType: OrderDiscountActivityTypeManJian, PromType: OrderDiscountActivityTypeManJian,
BeginTime: utils.Time2Str(time.Now().Add(1 * time.Hour)), BeginTime: utils.Time2Str(time.Now().Add(1 * time.Hour)),
EndTime: utils.Time2Str(time.Now().Add(48 * time.Hour)), EndTime: utils.Time2Str(time.Now().Add(48 * time.Hour)),
ParticipationMode: ParticipationModeAllSku, ParticipationMode: ParticipationModeAllSku,
Display: "hello", Display: "hello",
OutStationNos: []string{"25"}, OutStationNos: []string{"2"},
OutSkuIds: []string{"5199"}, // OutSkuIDs: []string{"5199"},
SkuIDs: []string{"2023747677"},
LimitUserTotalNumber: 1, LimitUserTotalNumber: 1,
RuleRequestList: []*OrderDiscountRuleRequest{ RuleRequestList: []*OrderDiscountRuleRequest{
&OrderDiscountRuleRequest{ &OrderDiscountRuleRequest{
@@ -35,7 +36,7 @@ func TestOrderDiscountSubmitActivity(t *testing.T) {
} }
func TestOrderDiscountQuerySubmitActivityResult(t *testing.T) { func TestOrderDiscountQuerySubmitActivityResult(t *testing.T) {
result, err := api.OrderDiscountQuerySubmitActivityResult(10000044) result, err := api.OrderDiscountQuerySubmitActivityResult(10000048)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@@ -43,7 +44,7 @@ func TestOrderDiscountQuerySubmitActivityResult(t *testing.T) {
} }
func TestOrderDiscountQueryActivityInfo(t *testing.T) { func TestOrderDiscountQueryActivityInfo(t *testing.T) {
result, err := api.OrderDiscountQueryActivityInfo(10000044) result, err := api.OrderDiscountQueryActivityInfo(10000046)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@@ -51,7 +52,7 @@ func TestOrderDiscountQueryActivityInfo(t *testing.T) {
} }
func TestOrderDiscountCancelActivity(t *testing.T) { func TestOrderDiscountCancelActivity(t *testing.T) {
err := api.OrderDiscountCancelActivity(10000044, "test", "") err := api.OrderDiscountCancelActivity(10000046, "test", "")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

34
platformapi/jdapi/promotion_sku_test.go
View File

@@ -15,12 +15,12 @@ func TestCreatePromotionSingle(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
skuInfos, err := api.CreatePromotionSkuSingle(infoId, "", []map[string]interface{}{ skuInfos, err := api.CreatePromotionSkuSingle(infoId, "", []*PromotionSku{
{ &PromotionSku{
KeyOutSkuId: "2216", OutSkuID: "2216",
KeyStationNo: 11682042, StationNo: 11682042,
KeyPromotionPrice: 500, PromotionPrice: 500,
KeyLimitSkuCount: 2, LimitSkuCount: 2,
}, },
}) })
if err != nil { if err != nil {
@@ -43,12 +43,12 @@ func TestCreatePromotionLimitTime(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
skuInfos, err := api.CreatePromotionSkuLimitTime(infoId, "", []map[string]interface{}{ skuInfos, err := api.CreatePromotionSkuLimitTime(infoId, "", []*PromotionSku{
{ &PromotionSku{
KeyOutSkuId: "2216", OutSkuID: "2216",
KeyStationNo: 11682042, StationNo: 11682042,
KeyPromotionPrice: 300, PromotionPrice: 300,
KeyLimitSkuCount: 2, LimitSkuCount: 2,
}, },
}) })
if err != nil { if err != nil {
@@ -60,13 +60,3 @@ func TestCreatePromotionLimitTime(t *testing.T) {
t.Fatal(err) 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")
}
}