From 2a4de66bd473b5bf47f8ec690bd37b91e3f28ee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 29 May 2023 10:04:27 +0800 Subject: [PATCH] 1 --- business/jxstore/cms/store.go | 9 +++-- business/partner/delivery/dada/waybill.go | 15 +------- business/partner/delivery/fn/store.go | 8 +---- business/partner/delivery/fn/waybill.go | 35 ------------------- business/partner/delivery/mtps/store.go | 12 +------ business/partner/partner_delivery.go | 1 - .../purchase/jx/localjx/kuaishou_pay.go | 4 +-- 7 files changed, 11 insertions(+), 73 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 65edfced8..fa893049c 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -2216,21 +2216,24 @@ func updateCourierStores(ctx *jxcontext.Context, storeID int) (err error) { } func UpdateStoreName() error { - var db = dao.GetDB() + var ( + db = dao.GetDB() + context = jxcontext.AdminCtx + ) + sql := ` SELECT * FROM store_courier_map WHERE vendor_id IN (?,?,?,?) AND deleted_at = ?` courierList := make([]*model.StoreCourierMap, 0, 0) if err := dao.GetRows(db, &courierList, sql, []interface{}{model.VendorIDMTPS, model.VendorIDFengNiao, model.VendorIDDada, model.VendorIDUUPT, utils.DefaultTimeValue}...); err != nil { globals.SugarLogger.Debugf("query Order err := %v", err) return err } - globals.SugarLogger.Debugf("====================len : %d", len(courierList)) for i := 0; i < len(courierList); i++ { storeDetail, _ := dao.GetStoreDetail2(db, courierList[i].StoreID, courierList[i].VendorStoreID, courierList[i].VendorID) formalizeStore4Courier(storeDetail) if handlerInfo := partner.GetDeliveryPlatformFromVendorID(storeDetail.VendorID); handlerInfo != nil { if updateHandler, _ := handlerInfo.Handler.(partner.IDeliveryUpdateStoreHandler); updateHandler != nil { - if err := updateHandler.UpdateStoreName(storeDetail.VendorStoreID, storeDetail.Name); err != nil { + if err := updateHandler.UpdateStore(context, storeDetail); err != nil { globals.SugarLogger.Debugf("err := %v,storeID : %s,storeName :%s , vendorId : %d", err, storeDetail.VendorStoreID, storeDetail.Name, storeDetail.VendorID) } } diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go index b5b954b4c..c1e785a8b 100644 --- a/business/partner/delivery/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -188,12 +188,6 @@ func (c *DeliveryHandler) callbackMsg2Waybill(msg *dadaapi.CallbackMsg) (retVal } func StoreDetail2ShopInfo(storeDetail *dao.StoreDetail2) (shopInfo *dadaapi.ShopInfo) { - // 获取品牌名称 - brandInfo, err := dao.GetBrands(dao.GetDB(), "", storeDetail.BrandID, "", false, "") - if err != nil { - return nil - } - lng := jxutils.IntCoordinate2Standard(storeDetail.Lng) lat := jxutils.IntCoordinate2Standard(storeDetail.Lat) cityName := storeDetail.CityName @@ -209,7 +203,7 @@ func StoreDetail2ShopInfo(storeDetail *dao.StoreDetail2) (shopInfo *dadaapi.Shop } shopInfo = &dadaapi.ShopInfo{ OriginShopID: storeDetail.VendorStoreID, - StationName: brandInfo[0].Name + "-" + storeDetail.Name, + StationName: storeDetail.Name, Business: dadaapi.BusinessTypeConvStore, // 故意设置成这个的 CityName: cityName, AreaName: districtName, @@ -624,10 +618,3 @@ func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId } return vendorPrice, nil } - -func (c *DeliveryHandler) UpdateStoreName(storeId, name string) (err error) { - return api.DadaAPI.ShopUpdate(&dadaapi.ShopInfo{ - StationName: name, - OriginShopID: storeId, - }) -} diff --git a/business/partner/delivery/fn/store.go b/business/partner/delivery/fn/store.go index 29c9fbddf..52f41bb10 100644 --- a/business/partner/delivery/fn/store.go +++ b/business/partner/delivery/fn/store.go @@ -109,12 +109,6 @@ func (c *DeliveryHandler) IsErrStoreNotExist(err error) bool { } func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.StoreDetail2) (err error) { - // 获取品牌名称 - brandInfo, err := dao.GetBrands(dao.GetDB(), "", storeDetail.BrandID, "", false, "") - if err != nil { - return err - } - // 获取蜂鸟门店id fnStore, err := api.FnAPI.GetStore(storeDetail.VendorStoreID) if err != nil { @@ -139,7 +133,7 @@ func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.S BusinessLicencePicHash: storeDetail.Licence, } if storeDetail.Name != fnStore.Name { - updateStore.HeadShopName = brandInfo[0].Name + "-" + storeDetail.Name + updateStore.HeadShopName = storeDetail.Name updateStore.BranchShopName = storeDetail.Name } if updateStore.OwnerName == "" { diff --git a/business/partner/delivery/fn/waybill.go b/business/partner/delivery/fn/waybill.go index 8ad67a44a..fa89e4f4d 100644 --- a/business/partner/delivery/fn/waybill.go +++ b/business/partner/delivery/fn/waybill.go @@ -473,38 +473,3 @@ func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId } return vendorPrice, nil } - -func (c *DeliveryHandler) UpdateStoreName(storeId, name string) (err error) { - // 获取蜂鸟门店id - fnStore, err := api.FnAPI.GetStore(storeId) - if err != nil { - return err - } - - updateStore := &fnpsapi.UpdateStoreParam{ - ChainStoreID: fnStore.ChainStoreID, - ContactPhone: fnStore.ContactPhone, - Address: fnStore.Address, - Longitude: fnStore.Longitude, - Latitude: fnStore.Latitude, - PositionSource: 3, - OutShopCode: fnStore.OutShopCode, - CategoryID: utils.Int2Str(fnStore.CategoryID), - OwnerName: fnStore.OwnerName, - OwnerIDNum: fnStore.OwnerIDNum, - HandheldLicencePicHash: "暂不需要(手持身份证、营业执照图片)", - OwnerIDPicFrontHash: "暂不需要(省份证正)", - OwnerIDPicBackHash: "暂不需要(身份证反)", - CreditCode: fnStore.CreditCode, - } - updateStore.HeadShopName = name - updateStore.BranchShopName = name - if updateStore.OwnerName == "" { - updateStore.OwnerName = "石锋" - } - if updateStore.OwnerIDNum == "" { - updateStore.OwnerIDNum = "610126198012230014" - } - - return api.FnAPI.UpdateStore(updateStore) -} diff --git a/business/partner/delivery/mtps/store.go b/business/partner/delivery/mtps/store.go index 6bda0797e..cbd945092 100644 --- a/business/partner/delivery/mtps/store.go +++ b/business/partner/delivery/mtps/store.go @@ -169,7 +169,6 @@ func (c *DeliveryHandler) IsErrStoreExist(err error) bool { func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.StoreDetail2) (err error) { if globals.EnableStoreWrite { - // err = api.MtpsAPI.PagePoiUpdate(storeDetail.VendorStoreID, storeDetail.PayeeName, storeDetail.Tel1, fakeContactEmail) shopInfo := &mtpsapi.ShopInfo{ ShopID: utils.Int2Str(storeDetail.ID), ContactName: storeDetail.PayeeName, @@ -177,18 +176,9 @@ func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.S ShopAddress: storeDetail.Address, ShopLat: storeDetail.Lat, ShopLng: storeDetail.Lng, + ShopName: storeDetail.Name, } _, err = api.MtpsAPI.ShopUpdate(shopInfo) } return err } - -// 美团配送,修改门店名称 -func (c *DeliveryHandler) UpdateStoreName(storeId, name string) (err error) { - shopInfo := &mtpsapi.ShopInfo{ - ShopID: storeId, - ShopName: name, - } - _, err = api.MtpsAPI.ShopUpdate(shopInfo) - return err -} diff --git a/business/partner/partner_delivery.go b/business/partner/partner_delivery.go index b34087e85..59ed20cc3 100644 --- a/business/partner/partner_delivery.go +++ b/business/partner/partner_delivery.go @@ -54,7 +54,6 @@ type IDeliveryPlatformHandler interface { type IDeliveryUpdateStoreHandler interface { UpdateStore(ctx *jxcontext.Context, storeDetail *dao.StoreDetail2) (err error) - UpdateStoreName(storeId, name string) (err error) } type DeliveryPlatformHandlerInfo struct { diff --git a/business/partner/purchase/jx/localjx/kuaishou_pay.go b/business/partner/purchase/jx/localjx/kuaishou_pay.go index 47243e554..e4ca64930 100644 --- a/business/partner/purchase/jx/localjx/kuaishou_pay.go +++ b/business/partner/purchase/jx/localjx/kuaishou_pay.go @@ -71,8 +71,8 @@ func pay4OrderByKs(ctx *jxcontext.Context, order *model.GoodsOrder, vendorPayTyp VendorID: order.VendorID, Status: 0, PayCreatedAt: time.Now(), - PrepayID: prePayInfo.OrderInfoToken, - CodeURL: prePayInfo.OrderNo, // 抖音支付token + PrepayID: prePayInfo.OrderNo, + CodeURL: prePayInfo.OrderInfoToken, // 抖音支付token TotalFee: int(order.ActualPayPrice), } }