Merge branch 'master' into mark

business/jxstore/act/act.go

@@ -170,8 +170,8 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac
 		}
 		storeIDs := jxutils.IntMap2List(storeIDMap)
 		skuIDs := jxutils.IntMap2List(skuIDMap)
-
-		if act.OverlapRule == model.OverlapRuleNormal {
+		// 判断活动是否重叠的检查，当前忽略京东平台及所有结算信息
+		if act.OverlapRule == model.OverlapRuleNormal && act.Type != model.ActSkuFake {
 			effectActStoreSkuList, err := dao.GetEffectiveActStoreSkuInfo(db, 0, vendorIDs, act.Type, storeIDs, skuIDs, act.BeginAt, act.EndAt)
 			if err != nil {
 				globals.SugarLogger.Errorf("GetEffectiveActStoreSkuInfo can not get sku promotion info for error:%v", err)