From 6801e17fc9db9337d4dfbf3b88c04474e406f4ec Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 19 Aug 2019 14:12:25 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E9=81=BF=E5=85=8D=E9=A5=BF=E7=99=BE?= =?UTF-8?q?=E7=BD=91=E9=A1=B5=E4=B8=8A=E6=8B=89=E4=B8=8B=E6=9D=A5=E7=9A=84?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E9=87=8D=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/ebai/act_page.go | 3 ++- business/partner/purchase/jd/act.go | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/ebai/act_page.go b/business/partner/purchase/ebai/act_page.go index 9d77cd344..c0fe778d2 100644 --- a/business/partner/purchase/ebai/act_page.go +++ b/business/partner/purchase/ebai/act_page.go @@ -1,6 +1,7 @@ package ebai import ( + "fmt" "time" "git.rosy.net.cn/jx-callback/business/jxutils" @@ -73,7 +74,7 @@ func (c *PurchaseHandler) GetPageActList(ctx *jxcontext.Context, createdFrom tim if utils.Timestamp2Time(ebaiAct.CreateTime).Sub(createdFrom) > 0 { act := &model.Act2{ Act: model.Act{ - Name: ebaiAct.ActivityName, + Name: fmt.Sprintf("%s-%s", ebaiAct.ActivityName, ebaiAct.ActivityID), Type: ebaiPageActType2Jx(ebaiAct.ActivityType), Status: ebaiPageActStatus2Jx(ebaiAct.Status), Source: ebaiAct.User, diff --git a/business/partner/purchase/jd/act.go b/business/partner/purchase/jd/act.go index d1119317c..0f2b04e26 100644 --- a/business/partner/purchase/jd/act.go +++ b/business/partner/purchase/jd/act.go @@ -1,6 +1,7 @@ package jd import ( + "fmt" "time" "git.rosy.net.cn/jx-callback/business/model/dao" @@ -328,7 +329,8 @@ func getActFromJD(promotionID string) (act *model.Act2, actStoreSkuList []*model result, err := api.JdAPI.QueryPromotionInfo(utils.Str2Int64(promotionID)) if err == nil && len(result.SkuResultList) > 0 { act = &model.Act2{ - Act: model.Act{Name: result.Source + "-" + utils.Int64ToStr(result.PromotionInfoID), + Act: model.Act{ + Name: fmt.Sprintf("%s-%d", result.Source, result.PromotionInfoID), Type: jdSkuActType2Jx(result.PromotionType), Status: jdSkuActStatus2Jx(result.PromotionState), BeginAt: result.SkuResultList[0].BeginTime.GoTime(),