diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 0deb3be0b..210a1572e 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -2293,15 +2293,14 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs skuBind.StatusSaleBegin = *skuBindInfo.StatusSaleBegin skuBind.StatusSaleEnd = *skuBindInfo.StatusSaleEnd } + } else { + if skuBind.StatusSaleBegin != 0 || skuBind.StatusSaleEnd != 0 { + updateFieldMap["StatusSaleBegin"] = 1 + updateFieldMap["StatusSaleEnd"] = 1 + } + skuBind.StatusSaleBegin = 0 + skuBind.StatusSaleEnd = 0 } - //if skuBindInfo.StatusSaleBegin == 0 && skuBindInfo.StatusSaleEnd == 0 { - // if skuBind.StatusSaleBegin != skuBindInfo.StatusSaleBegin || skuBind.StatusSaleEnd != skuBindInfo.StatusSaleEnd { - // updateFieldMap["StatusSaleBegin"] = 1 - // updateFieldMap["StatusSaleEnd"] = 1 - // } - // skuBind.StatusSaleBegin = skuBindInfo.StatusSaleBegin - // skuBind.StatusSaleEnd = skuBindInfo.StatusSaleEnd - //} if globals.IsAddEvent { if len(updateFieldMap) > 0 { diff --git a/business/partner/purchase/mtwm/store_sku2.go b/business/partner/purchase/mtwm/store_sku2.go index 603d13e15..38a541c62 100644 --- a/business/partner/purchase/mtwm/store_sku2.go +++ b/business/partner/purchase/mtwm/store_sku2.go @@ -427,6 +427,10 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI availableTimes := fmt.Sprintf("%s-%s", saleStart, saleEnd) available, _ := json.Marshal(map[string]string{"monday": availableTimes, "tuesday": availableTimes, "wednesday": availableTimes, "thursday": availableTimes, "friday": availableTimes, "saturday": availableTimes, "sunday": availableTimes}) foodData["available_times"] = string(available) + } else { + availableTimes := "00:01-23:59" + available, _ := json.Marshal(map[string]string{"monday": availableTimes, "tuesday": availableTimes, "wednesday": availableTimes, "thursday": availableTimes, "friday": availableTimes, "saturday": availableTimes, "sunday": availableTimes}) + foodData["available_times"] = string(available) } foodData["sequence"] = storeSku.GetSeq() if storeSku.VendorVendorCatID != 0 {