From 5f268e37462eac92b4c7c612d250417c83d2a857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 5 Feb 2025 16:46:04 +0800 Subject: [PATCH] 1 --- .../partner/purchase/tao_vegetable/store.go | 127 +++++++++--------- 1 file changed, 60 insertions(+), 67 deletions(-) diff --git a/business/partner/purchase/tao_vegetable/store.go b/business/partner/purchase/tao_vegetable/store.go index 139e86b20..89251b175 100644 --- a/business/partner/purchase/tao_vegetable/store.go +++ b/business/partner/purchase/tao_vegetable/store.go @@ -318,75 +318,68 @@ func (p *PurchaseHandler) DeleteStore(db *dao.DaoDB, storeID int, userName strin } func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName string) (err error) { - //var name string - //if db == nil { - // db = dao.GetDB() - //} - //mtapi := getAPI(getStoreVendorOrgCode(storeID), storeID, "") - ////获取本地store信息 - //storeDetail, err := dao.GetStoreDetail(db, storeID, model.VendorIDMTWM, "") - //if err != nil { - // return err - //} - //errList := errlist.New() - ////获取平台store信息 - //remoteStoreInfo, err := mtapi.PoiGet(storeDetail.VendorStoreID) - //if err != nil { - // return err - //} - //mergedStoreStatus := jxutils.MergeStoreStatus(storeDetail.Status, storeDetail.VendorStatus) - //name = remoteStoreInfo.Name - //if storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreName) != 0 { - // if storeDetail.VendorStoreName != "" { - // name = storeDetail.VendorStoreName + + //获取本地store信息 + storeDetail, err := dao.GetStoreDetail(db, storeID, model.VendorIDTaoVegetable, "") + if err != nil { + return err + } + + a := getAPI(storeDetail.VendorOrgCode, 0, storeDetail.VendorStoreID) + errList := errlist.New() + + // 营业状态 + vendorStoreStatus := -1 + if storeDetail.VendorStatus == model.YES { + vendorStoreStatus = model.YES + } + if err = a.ShopUpdateStatus(storeDetail.VendorStoreID, int64(vendorStoreStatus)); err != nil { + errList.AddErr(fmt.Errorf("营业状态：%v", err)) + } + + // 营业时间 + //if CheckBusinessTime(storeDetail.OpenTime1, store.EndTime) { + storeOpenTime := jxutils.JxOperationTime2StrTime(storeDetail.OpenTime1) + storeCloseTime := "" + if storeDetail.CloseTime2 != model.NO { + storeCloseTime = jxutils.JxOperationTime2StrTime(storeDetail.CloseTime2) + } else { + storeCloseTime = jxutils.JxOperationTime2StrTime(storeDetail.CloseTime1) + } + if err = a.ShopUpdateInfo(storeDetail.VendorStoreID, storeOpenTime, storeCloseTime); err != nil { + errList.AddErr(fmt.Errorf("营业时间：%v", err)) + } + + //for _, v := range store.Flag { + // switch v { + // case FlagStatus: + // if err = a.ShopUpdateStatus(store.TxdStoreID, store.Status); err != nil { + // errList.AddErr(fmt.Errorf("营业状态：%v", err)) + // } + // case FlagBusinessTime: + // if len(store.StartTime) == 0 || len(store.EndTime) == 0 { + // return errors.New("更新营业时间，时间必填") + // } + // if CheckBusinessTime(store.StartTime, store.EndTime) { + // if err = a.ShopUpdateInfo(store.TxdStoreID, store.StartTime, store.EndTime); err != nil { + // errList.AddErr(fmt.Errorf("营业时间：%v", err)) + // } + // } + // case FlagRange: + // if len(store.Points) == 0 { + // return errors.New("更新营业范围，坐标必填") + // } + // point := GetPoints(store.Points) + // if err = a.ShopUpdateRange(store.TxdStoreID, point); err != nil { + // errList.AddErr(fmt.Errorf("营业范围：%v", err)) + // } + // default: + // return nil // } - // // else { - // // name = jxutils.ComposeStoreName(storeDetail.Store.Name, model.VendorIDMTWM) - // // } //} - //store := fmt.Sprintf("门店id:%d,门店名称:%s,第三方门店状态:%d,本地修改前门店状态%d,本地门店修改后状态:%d,第三方平台Id(美团):%s", storeID, remoteStoreInfo.Name, remoteStoreInfo.IsOnline, storeDetail.Status, mergedStoreStatus, storeDetail.VendorOrgCode) - //event.AddOperateEvent(jxcontext.AdminCtx, jxcontext.AdminCtx.GetTrackInfo(), store, "", "", 10, "UpdateStore") - //// openLevel, isOnline := bizStatusJX2Mtwm(mergedStoreStatus) - ////TODO 美团暂时不用那个电话 - //phone := storeDetail.Tel1 - //// if storeDetail.MarketManPhone != "" { - //// phone = storeDetail.MarketManPhone - //// } else { - //// phone = model.VendorStoreTel - //// } - //params := map[string]interface{}{ - // "name": name, //jxutils.ComposeStoreName(storeDetail.Store.Name, model.VendorIDMTWM), - // "address": storeDetail.Address, // 美团好像地址也不能改的? - // "longitude": jxutils.IntCoordinate2Standard(int(remoteStoreInfo.Longitude)), - // "latitude": jxutils.IntCoordinate2Standard(int(remoteStoreInfo.Latitude)), - // "phone": phone, - // "shipping_fee": remoteStoreInfo.ShippingFee, - // "shipping_time": remoteStoreInfo.ShippingTime, - // "open_level": remoteStoreInfo.OpenLevel, - // "is_online": remoteStoreInfo.IsOnline, - // "third_tag_name": remoteStoreInfo.ThirdTagName, - // "promotion_info": storeDetail.PromoteInfo, - //} - //if globals.EnableMtwmStoreWrite { - // errList.AddErr(mtapi.PoiSave(storeDetail.VendorStoreID, params)) - //} - //// PoiSave有时会报错：商家已接入美团配送，不可修改门店配送相关信息，这里放弃信息修改 - //// if err != nil { - //// if utils.IsErrMatch(err, utils.Int2Str(mtwmapi.ErrCodeCanNotModifyStoreDeliveryInfo), nil) { - //// if storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 { - //// err = p.UpdateStoreStatus(jxcontext.AdminCtx, storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID, mergedStoreStatus) - //// } else { - //// err = nil - //// } - //// } - //// errList.AddErr(err) - //// } - //if storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 { - // errList.AddErr(p.UpdateStoreStatus(jxcontext.AdminCtx, storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID, mergedStoreStatus)) - //} - //errList.AddErr(p.UpdateStoreOpTime(jxcontext.AdminCtx, storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID, storeDetail.GetOpTimeList())) - //// errList.AddErr(p.UpdateStoreBoxFee(jxcontext.AdminCtx, storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID)) - //return errList.GetErrListAsOne() + if errList.GetErrListAsOne() != nil { + return errList.GetErrListAsOne() + } return nil }