- 去除几个误用ZeroTimeValue的地方

business/jxstore/act/act.go

@@ -117,7 +117,7 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac
 								VendorID: vendorID,
 
 								SyncStatus:  model.SyncFlagNewMask,
-								VendorPrice: int64(jxutils.CaculateSkuVendorPrice(storeSkuInfo.Price, int(storeDetail.PricePercentage), 0)),
+								VendorPrice: int64(jxutils.CaculateSkuVendorPrice(storeSkuInfo.Price, jxutils.GetPricePercentage(storeDetail.PricePercentagePackObj, storeSkuInfo.Price, int(storeDetail.PricePercentage)), 0)),
 							}
 							v.OriginalPrice = actSkuMap.VendorPrice
 							if v.ActPrice != 0 {
@@ -499,7 +499,7 @@ func (a *ActManager) IsVendorActExist(ctx *jxcontext.Context, vendorActID string
 		VendorActID: vendorActID,
 		VendorID:    vendorID,
 	}
-	actMap.DeletedAt = utils.ZeroTimeValue
+	actMap.DeletedAt = utils.DefaultTimeValue
 	if err := dao.GetEntity(db, actMap, "VendorActID", "VendorID", "DeletedAt"); err == nil {
 		isExist = true
 	}

business/jxstore/cms/store.go

@@ -632,7 +632,7 @@ func SetStoreStatus(ctx *jxcontext.Context, storeID, status int) (err error) {
 func EnableHaveRestStores(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) (hint string, err error) {
 	storeInfo, err := GetStores(ctx, "", map[string]interface{}{
 		"statuss": string(utils.MustMarshal([]int{model.StoreStatusHaveRest})),
-	}, 0, model.UnlimitedPageSize, utils.ZeroTimeValue, utils.ZeroTimeValue, 0, 0)
+	}, 0, model.UnlimitedPageSize, utils.DefaultTimeValue, utils.DefaultTimeValue, 0, 0)
 	if err != nil {
 		return "", err
 	}

business/model/act.go

@@ -89,7 +89,12 @@ type ActMap struct {
 func (*ActMap) TableUnique() [][]string {
 	return [][]string{
 		[]string{"ActID", "VendorID", "DeletedAt"},
-		[]string{"VendorActID", "VendorID", "DeletedAt"},
+	}
+}
+
+func (*ActMap) TableIndex() [][]string {
+	return [][]string{
+		[]string{"VendorActID", "VendorID", "DeletedAt"}, // 饿百，美团活动的VendorActID统一为空，不能设置为唯一索引
 	}
 }