diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 53c2a246a..f49b9f0c2 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -987,6 +987,8 @@ func AddStoreCourierMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID } func addStoreCourierMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID int, storeCourierMap *model.StoreCourierMap, isNeedUpdateRemote bool) (outStoreCourierMap *model.StoreCourierMap, err error) { + globals.SugarLogger.Debugf("addStoreCourierMap %s, storeID:%d, isNeedUpdateRemote:%t", model.VendorChineseNames[vendorID], storeCourierMap, isNeedUpdateRemote) + userName := ctx.GetUserName() if handler := partner.GetDeliveryPlatformFromVendorID(vendorID); handler != nil { if db == nil { @@ -1068,6 +1070,8 @@ func UpdateStoreCourierMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendo } func updateCourierStore(ctx *jxcontext.Context, storeDetail *dao.StoreDetail2) (err error) { + globals.SugarLogger.Debugf("updateCourierStore %s, storeID:%d, vendorStoreID:%s", model.VendorChineseNames[storeDetail.VendorID], storeDetail.ID, storeDetail.VendorStoreID) + if handlerInfo := partner.GetDeliveryPlatformFromVendorID(storeDetail.VendorID); handlerInfo != nil && handlerInfo.Use4CreateWaybill { if updateHandler, ok := handlerInfo.Handler.(partner.IDeliveryUpdateStoreHandler); ok { storeDetail.CourierStoreName = composeDadaStoreName(storeDetail) @@ -1078,6 +1082,8 @@ func updateCourierStore(ctx *jxcontext.Context, storeDetail *dao.StoreDetail2) ( } func updateCourierStores(ctx *jxcontext.Context, storeID int) (err error) { + globals.SugarLogger.Debugf("updateCourierStores storeID:%d", storeID) + db := dao.GetDB() errList := errlist.New() for k, v := range partner.DeliveryPlatformHandlers { @@ -1095,6 +1101,8 @@ func updateCourierStores(ctx *jxcontext.Context, storeID int) (err error) { } func updateOrCreateCourierStore(ctx *jxcontext.Context, storeDetail *dao.StoreDetail2) (isCreated bool, err error) { + globals.SugarLogger.Debugf("updateOrCreateCourierStore %s, storeID:%d, vendorStoreID:%s", model.VendorChineseNames[storeDetail.VendorID], storeDetail.ID, storeDetail.VendorStoreID) + if handlerInfo := partner.GetDeliveryPlatformFromVendorID(storeDetail.VendorID); handlerInfo != nil && handlerInfo.Use4CreateWaybill { if storeDetail.DistrictName == "" { return false, fmt.Errorf("门店的区码有问题,请检查") @@ -1124,6 +1132,8 @@ func updateOrCreateCourierStore(ctx *jxcontext.Context, storeDetail *dao.StoreDe } func UpdateOrCreateCourierStores(ctx *jxcontext.Context, storeID int, isForceUpdate, isAsync, isContinueWhenError bool) (hint string, err error) { + globals.SugarLogger.Debugf("UpdateOrCreateCourierStores storeID:%d", storeID) + var storeIDs []int if storeID != 0 { storeIDs = []int{storeID} @@ -1148,7 +1158,7 @@ func UpdateOrCreateCourierStores(ctx *jxcontext.Context, storeID int, isForceUpd if _, ok := v.Handler.(partner.IDeliveryUpdateStoreHandler); ok { storeDetail, err2 := dao.GetStoreDetail2(db, storeID, "", k) if err = err2; err2 == nil { - isStoreExist := storeDetail.VendorStoreID == "" + isStoreExist := storeDetail.VendorStoreID != "" storeDetail.VendorStoreID = utils.Int2Str(storeDetail.ID) if isForceUpdate || !isStoreExist { var isCreated bool diff --git a/business/partner/delivery/mtps/store.go b/business/partner/delivery/mtps/store.go index e6550f2e7..1ae6c9f2c 100644 --- a/business/partner/delivery/mtps/store.go +++ b/business/partner/delivery/mtps/store.go @@ -85,3 +85,10 @@ func (c *DeliveryHandler) GetStore(ctx *jxcontext.Context, storeID int, vendorSt func (c *DeliveryHandler) IsErrStoreNotExist(err error) bool { return mtpsapi.IsErrShopNotExist(err) } + +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, "fakeemail@163.com") + } + return err +} diff --git a/conf/app.conf b/conf/app.conf index 01afb39d3..455bc3d25 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -52,6 +52,7 @@ wxBackstageHost = "http://wx.jxc4.com" jdStorePageCookie = "YYJV3NHVBPHLD36FWP6F3EM5PTXJ2XZQS7U4HWRIDPP4IWGUKUIB4XG5N26CZRDLDF7PKOXBPD6BNTUAJLETLZOIWMCVFI3K6MYZIY4QBIXIMXYDJNUKFGJVQTN5356SAD6WPCIHWNQAG7DDMF7L7S3SHDYZP7PPVMRGO4VWG2JRBMKFTOGIWZ5L2XHXC3SXQ4OLX7EL4RKUPZQT6GOH63KE3EVK37L5LG7TGSDGXFQP4377YK72UB5YZG6IJH6PY25YLLCJYPMDSHKPGYBUFJ4MMMKGN6MWB37CP7XVDBBZJ3U462ENTEXH744AWCQCIG2AAE2PKYVHC" ebaiStorePageCookieWMUSS = "4AAPQCAAB5PF0aUGcBVzoRTCEkOFhFIhx-Yk9vN2EfPHYoLlROKBEsQmAUQjhNUgRt0ADAP5x-RFklwAAdjxGO11iOj8xKXYSSDIJb2BcPghsaklNfQwGS10JOVRFfhAiYElhEXFXIzoJKyloCGdwdFE6Qk9FRxojUFN3FVEHNjJPZJu4Bt9nxQ13cwoMbjA" ebaiStorePageCookieWMSTOKEN = "AcAANQZAABbC04rUBZFc2UYanlocDAaP0dcfzZCeS1SHQ1qJ15ExgAA13A2dGLjdbcitBZJu4Bn6B_g6cZAAA0tyyFm8cdBaNAQAAwug8HTG0xRjwt1UZzbcAAN7ofRO" +mtpsStoreToken = "0seqGSJnhbr4XJ0EaIQL6CoOpnaV1ErgS42uOlzNXYIX7PeuLuyCFQQZKKWGExJ7IMTQQQDe5H6YMmVFnxjCkw" weimobAppID = "319F5E7FB6784DFCA3684C9333EB7744" weimobAppSecret = "7267AA7F58261F6965599218F5A1D592" diff --git a/globals/api/api.go b/globals/api/api.go index 04bca6fa9..2e87791b7 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -61,7 +61,9 @@ func init() { func Init() { if !beego.AppConfig.DefaultBool("disableJd", false) { JdAPI = jdapi.New(beego.AppConfig.String("jdToken"), beego.AppConfig.String("jdAppKey"), beego.AppConfig.String("jdSecret")) - JdAPI.SetStoreCookie(beego.AppConfig.DefaultString("jdStorePageCookie", "")) + cookieValue := beego.AppConfig.DefaultString("jdStorePageCookie", "") + JdAPI.SetCookie("shop.o2o.jd.com1", cookieValue) + JdAPI.SetCookie("lsp-store1.jddj.com", cookieValue) } else { JdAPI = nil } @@ -88,8 +90,8 @@ func Init() { ebaiStorePageCookieWMUSS := beego.AppConfig.DefaultString("ebaiStorePageCookieWMUSS", "") ebaiStorePageCookieWMSTOKEN := beego.AppConfig.DefaultString("ebaiStorePageCookieWMSTOKEN", "") if ebaiStorePageCookieWMUSS != "" && ebaiStorePageCookieWMSTOKEN != "" { - EbaiAPI.SetStoreCookie("WMUSS", ebaiStorePageCookieWMUSS) - EbaiAPI.SetStoreCookie("WMSTOKEN", ebaiStorePageCookieWMSTOKEN) + EbaiAPI.SetCookie("WMUSS", ebaiStorePageCookieWMUSS) + EbaiAPI.SetCookie("WMSTOKEN", ebaiStorePageCookieWMSTOKEN) } } else { EbaiAPI = nil @@ -97,6 +99,9 @@ func Init() { if !beego.AppConfig.DefaultBool("disableMtps", false) { MtpsAPI = mtpsapi.New(beego.AppConfig.String("mtpsAppKey"), beego.AppConfig.String("mtpsSecret")) + if mtpsStoreToken := beego.AppConfig.DefaultString("mtpsStoreToken", ""); mtpsStoreToken != "" { + MtpsAPI.SetCookie("token", mtpsStoreToken) + } } else { MtpsAPI = nil }