Accept Merge Request #25: (su -> mark)

Merge Request: 定时刷新商品可售状态
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/25
This commit is contained in:
苏尹岚
2019-11-15 16:57:33 +08:00

View File

@@ -662,7 +662,7 @@ func (v *VendorSync) ChangeStoreSkuSaleStatus(ctx *jxcontext.Context, storeID in
db := dao.GetDB() db := dao.GetDB()
storeSkuList, err := dao.GetStoresSkusInfoBySaleTime(db, storeID) storeSkuList, err := dao.GetStoresSkusInfoBySaleTime(db, storeID)
if len(storeSkuList) < 1 || err != nil { if len(storeSkuList) < 1 || err != nil {
return errors.New(fmt.Sprintf("未查询到设置了可售时间的商品 GetStoresSkusInfoBySaleTimeerr : %v", err)) return nil
} }
for _, v := range storeSkuList { for _, v := range storeSkuList {
storeIDs = append(storeIDs, v.StoreID) storeIDs = append(storeIDs, v.StoreID)
@@ -671,11 +671,8 @@ func (v *VendorSync) ChangeStoreSkuSaleStatus(ctx *jxcontext.Context, storeID in
vendorIDs := partner.GetPurchasePlatformVendorIDs() vendorIDs := partner.GetPurchasePlatformVendorIDs()
dao.UpdateStoreSkuBindSyncStatus(db, vendorIDs, storeID) dao.UpdateStoreSkuBindSyncStatus(db, vendorIDs, storeID)
v.SyncStoresSkus(ctx, db, vendorIDs, storeIDs, skuIDs, false, isAsync, isContinueWhenError) v.SyncStoresSkus(ctx, db, vendorIDs, storeIDs, skuIDs, false, isAsync, isContinueWhenError)
if err != nil {
return err return err
} }
return nil
}
func GetTimeMixByInt(begin1, end1, begin2, end2 int16) (beginAt, endAt int16) { func GetTimeMixByInt(begin1, end1, begin2, end2 int16) (beginAt, endAt int16) {
if (begin1 > begin2 && begin1 > end2) || (begin2 > end1 && end2 > end1) { if (begin1 > begin2 && begin1 > end2) || (begin2 > end1 && end2 > end1) {