diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index b524fec03..4785f2d8b 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -429,7 +429,11 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus bo storeIDs, skuIDs = GetStoreAndSkuIDsFromInfo(skuNamesInfo) } beginTime := time.Now() - err = updateActPrice4StoreSkuName(db, storeIDs, skuIDs, skuNamesInfo) + if globals.EnableNewAct { + err = updateActPrice4StoreSkuNameNew(db, storeIDs, skuIDs, skuNamesInfo) + } else { + err = updateActPrice4StoreSkuName(db, storeIDs, skuIDs, skuNamesInfo) + } globals.SugarLogger.Debugf("GetStoresSkusNew updateActPrice4StoreSkuName:%v", time.Now().Sub(beginTime)) } } diff --git a/controllers/jd_callback.go b/controllers/jd_callback.go index 1156f1b09..8d48ed9cf 100644 --- a/controllers/jd_callback.go +++ b/controllers/jd_callback.go @@ -126,7 +126,11 @@ func (c *DjswController) SinglePromoteCreate() { if c.Ctx.Input.Method() == http.MethodPost { obj, callbackResponse := api.JdAPI.GetOrderCallbackMsg(getUsefulRequest(c.Ctx)) if callbackResponse == nil { - callbackResponse = promotion.OnNewPromotionMsg(obj) + if globals.EnableNewAct { + callbackResponse = jd.OnActMsg(obj) + } else { + callbackResponse = promotion.OnNewPromotionMsg(obj) + } } c.Data["json"] = c.transferResponse("SinglePromoteCreate", callbackResponse) c.ServeJSON() diff --git a/controllers/promotion.go b/controllers/promotion.go index f4773d3d9..0b8e3922d 100644 --- a/controllers/promotion.go +++ b/controllers/promotion.go @@ -1,7 +1,11 @@ package controllers import ( + "fmt" + "git.rosy.net.cn/jx-callback/business/jxutils" + "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/globals" "github.com/astaxie/beego" @@ -36,6 +40,11 @@ type PromotionController struct { // @router /CreatePromotion [post] func (c *PromotionController) CreatePromotion() { c.callCreatePromotion(func(params *tPromotionCreatePromotionParams) (retVal interface{}, errCode string, err error) { + if globals.EnableNewAct { + if params.VendorID == model.VendorIDJD { + return retVal, "", fmt.Errorf("请使用新版活动管理创建平台活动") + } + } beginAt, err := utils.TryStr2Time(params.BeginAt) if err != nil { return retVal, "", err diff --git a/globals/globals.go b/globals/globals.go index ea92b747c..102ef6163 100644 --- a/globals/globals.go +++ b/globals/globals.go @@ -43,6 +43,8 @@ var ( GetWeixinTokenKey string StoreName string + + EnableNewAct bool ) func init() {