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

business/jxstore/cms/store_sku.go

@@ -2974,6 +2974,7 @@ func FocusStoreSkusBySku(ctx *jxcontext.Context, skuIDs []int, isAsync, isContin
 						}
 					}
 					skuBindInfo := &StoreSkuBindInfo{
+						StoreID:   store.ID,
 						NameID:    k,
 						UnitPrice: price,
 						IsFocus:   1,
@@ -2994,7 +2995,7 @@ func FocusStoreSkusBySku(ctx *jxcontext.Context, skuIDs []int, isAsync, isContin
 		case 2:
 			for _, v := range result1 {
 				tUpdate := v.(*tUpdateStoresSkus)
-				UpdateStoresSkus(ctx, []int{tUpdate.StoreID}, tUpdate.SkuBindInfos, false, isAsync, isContinueWhenError)
+				UpdateStoresSkusByBind(ctx, tUpdate.SkuBindInfos, isAsync, isContinueWhenError)
 			}
 		}
 		return result, err

business/jxstore/event/event.go

@@ -1,9 +1,11 @@
 package event
 
-func AddOperateEvent() {
+import "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+
+func AddOperateEvent(ctx *jxcontext.Context) {
 
 }
 
-func AddOperateEventDetail() {
+func AddOperateEventDetail(ctx *jxcontext.Context) {
 
 }

business/jxstore/report/report.go

@@ -65,6 +65,9 @@ func BeginSavePriceRefer(ctx *jxcontext.Context, cityCodes, skuIDs []int, isAsyn
 	var priceReferSnapshotList []*model.PriceReferSnapshot
 	db := dao.GetDB()
 	snapshotAt := utils.Time2Date(time.Now().AddDate(0, 0, -1))
+	dao.DeletePriceReferHistory(db, utils.Time2Date(snapshotAt.AddDate(0, 0, -7)))
+	priceReferSnapshotDelete := &model.PriceReferSnapshot{SnapshotAt: snapshotAt}
+	dao.DeleteEntity(db, priceReferSnapshotDelete, "SnapshotAt")
 	taskSeqFunc := func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
 		switch step {
 		case 0:
@@ -79,9 +82,6 @@ func BeginSavePriceRefer(ctx *jxcontext.Context, cityCodes, skuIDs []int, isAsyn
 						}
 					}
 				}()
-				dao.DeletePriceReferHistory(db, utils.Time2Date(snapshotAt.AddDate(0, 0, -7)))
-				priceReferSnapshotDelete := &model.PriceReferSnapshot{SnapshotAt: snapshotAt}
-				dao.DeleteEntity(db, priceReferSnapshotDelete, "SnapshotAt")
 				taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 					v := batchItemList[0].(*model.PriceReferSnapshot)
 					dao.WrapAddIDCULDEntity(v, ctx.GetUserName())

business/model/dao/dao_order.go

@@ -1096,6 +1096,7 @@ func GetOrdersSupplement(db *DaoDB, storIDs, vendorIDs, statuss []int, vendorOrd
 	} else if IsReverse == 1 {
 		sql += " AND link_id <> 0"
 	}
+	sql += " ORDER BY supplement_time DESC"
 	sql += " LIMIT ? OFFSET ?"
 	sqlParams = append(sqlParams, pageSize, offset)
 	Begin(db)

business/model/store.go

@@ -475,6 +475,7 @@ type PriceReferSnapshot struct {
 
 func (*PriceReferSnapshot) TableUnique() [][]string {
 	return [][]string{
+		[]string{"CityCode", "SkuID", "SnapshotAt"},
 		[]string{"CityCode", "NameID", "SkuID", "SnapshotAt"},
 	}
 }

controllers/act.go

@@ -76,6 +76,7 @@ func (c *ActController) PreCreateAct() {
 // @Param	pricePercentage	formData	int		true	"活动价格比例"
 // @Param	advertising		formData	string	true	"广告语"
 // @Param	actStoreSkuList	formData	string	true	"活动门店商品信息"
+// @Param	overlapRule		formData	int		false	"活动重叠规则"
 // @Param	limitDaily		formData	int		false	"是否按日0-不限，>0限购单数（秒杀需填）"
 // @Param	limitUser		formData	int		false	"是否用户限购0-不限，1-限购"
 // @Param	limitCount		formData	int		false	"限购件数 0-不限，如账号限购、设备限购有一个为1，则限购件数必须大于0的整数"
@@ -99,6 +100,7 @@ func (c *ActController) CreateAct() {
 					LimitUser:   params.LimitUser,
 					LimitDaily:  params.LimitDaily,
 					LimitCount:  params.LimitCount,
+					OverlapRule: params.OverlapRule,
 					// Source:,
 					CreateType:      model.ActCreateTypeAPI,
 					PricePercentage: params.PricePercentage,