Merge remote-tracking branch 'origin/mark' into su

business/jxstore/act/act.go

@@ -167,7 +167,7 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac
 		storeIDs := jxutils.IntMap2List(storeIDMap)
 		skuIDs := jxutils.IntMap2List(skuIDMap)
 		// 判断活动是否重叠的检查，当前忽略京东平台及所有结算信息
-		if !(len(vendorIDs) == 1 && vendorIDs[0] == model.VendorIDJD || act.Type == model.ActSkuFake) {
+		if act.OverlapRule == model.OverlapRuleNormal {
 			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)

business/model/act.go

@@ -28,6 +28,9 @@ const (
 	ActCreateTypeAPI      = 1
 	ActCreateTypeCallback = 2
 	ActCreateTypeSpider   = 3
+
+	OverlapRuleNormal  = 0 // 不允许重叠（重叠会报错）
+	OverlapRuleReplace = 1 // 相同活动类型，或秒杀替换直降
 )
 
 var (
@@ -63,6 +66,7 @@ type Act struct {
 	LimitCount      int       `json:"limitCount"` // 每单限购数量
 	Source          string    `orm:"size(255)" json:"source"`
 	CreateType      int       `json:"createType"`
+	OverlapRule     int       `json:"overlapRule"`
 	PricePercentage int       `json:"pricePercentage"` // 单品级活动才有效
 	BeginAt         time.Time `orm:"type(datetime);index" json:"beginAt"`
 	EndAt           time.Time `orm:"type(datetime);index" json:"endAt"`

business/partner/purchase/jx/localjx/order.go

@@ -170,7 +170,8 @@ func BuyerCancelOrder(ctx *jxcontext.Context, orderID int64, reason string) (can
 				canceled = true
 			}
 		} else {
-			err = changeOrderStatus(utils.Int64ToStr(orderID), model.OrderStatusApplyCancel, fmt.Sprintf("用户%s主动取消", ctx.GetUserName()))
+			err = fmt.Errorf("暂不支持自行取消订单，请联系商家取消")
+			// err = changeOrderStatus(utils.Int64ToStr(orderID), model.OrderStatusApplyCancel, fmt.Sprintf("用户%s主动取消", ctx.GetUserName()))
 		}
 	}
 	return canceled, err