diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go index 2abc329bf..609d1b26e 100644 --- a/business/jxstore/cms/sync.go +++ b/business/jxstore/cms/sync.go @@ -194,7 +194,7 @@ func (v *VendorSync) SyncStore2(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs handler := v.GetStoreHandler(loopMapInfo.VendorID) if handler != nil { if len(loopMapInfo.StoreMapList) > 1 { - loopStoreTask := tasksch.NewParallelTask(fmt.Sprintf("处理平台%s", model.VendorChineseNames[loopMapInfo.VendorID]), nil, ctx, + loopStoreTask := tasksch.NewParallelTask(fmt.Sprintf("处理平台%s", model.VendorChineseNames[loopMapInfo.VendorID]), tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { var resultList []interface{} storeMap := batchItemList[0].(*model.StoreMap) diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go index 0aecee4ea..f12429f30 100644 --- a/business/partner/purchase/mtwm/store.go +++ b/business/partner/purchase/mtwm/store.go @@ -295,7 +295,9 @@ func (c *PurchaseHandler) UpdateStoreCustomID(ctx *jxcontext.Context, vendorOrgC func (c *PurchaseHandler) UpdateStoreBoxFee(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string) (err error) { boxFee, err := dao.GetSysConfigAsInt64(dao.GetDB(), model.ConfigSysMtwmBoxFee) if err == nil { - err = api.MtwmAPI.PackagePriceUpdate(vendorStoreID, 1, int(boxFee)) + if globals.EnableMtwmStoreWrite { + err = api.MtwmAPI.PackagePriceUpdate(vendorStoreID, 1, int(boxFee)) + } } return err } diff --git a/conf/app.conf b/conf/app.conf index 7f424bacf..bf065214d 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -15,7 +15,7 @@ dadaAppSecret = "2c717ad914767d6e2beb3f743db9e477" mtwmAppID = "589" mtwmSecret = "a81eb3df418d83d6a1a4b7c572156d2f" mtwmCallbackURL = "http://callback.jxc4.com" -mtwmCookieStr = "_lxsdk_cuid=16eb02a8a02c8-0a92cb9af9798c-3d375b01-15f900-16eb02a8a02c8; _lxsdk=16eb02a8a02c8-0a92cb9af9798c-3d375b01-15f900-16eb02a8a02c8; device_uuid=!aaa93749-2445-4e1e-b178-956ac0ea5e45; pushToken=0sMxJkF87HeJFNGInMgnpvQ3ohIqeo_UMZ8VDif29S6s*; _lx_utm=utm_source%3DBaidu%26utm_medium%3Dorganic; wpush_server_url=wss://wpush.meituan.com; acctId=26599188; token=0o7UnNs2yauqdj86R145ow78W9cT9krlWpKPmCan2z7Q*; brandId=-1; wmPoiId=-1; isOfflineSelfOpen=0; city_id=0; isChain=1; existBrandPoi=true; ignore_set_router_proxy=true; region_id=; region_version=0; newCategory=false; bsid=PgNahlgfXvqnBiqv9tIi9zg7LDWtV8n70tkl_GhfueXgrLxV9BEb1rP9emUMnUUKPI6rANs_Y-chSdYLZS3KCA; cityId=510100; provinceId=510000; city_location_id=0; location_id=0; JSESSIONID=uht6v2iau9s6fx86r1ue6vzd; set_info=%7B%22wmPoiId%22%3A-1%2C%22ignoreSetRouterProxy%22%3Atrue%7D; igateApp=shangouepc; LX_SC_CONSTANT=c_nehoktcu; shopCategory=food; _lxsdk_s=16f40af4486-049-a66-a48%7C26337904%7C37" +mtwmCookieStr = "wm_order_channel=default; au_trace_key_net=default; _lxsdk_cuid=16a06076fa9c8-0330615db0f347-36697e04-1fa400-16a06076fa9c8; openh5_uuid=16a06076fa9c8-0330615db0f347-36697e04-1fa400-16a06076fa9c8; _ga=GA1.2.742821845.1555040388; uuid=ff9a9ceb627b4d048ebc.1556697582.1.0.0; userTicket=cwXEdWCAJIRgPjfNStZsTmqQePWfcObedoccxrnr; _hc.v=a527d080-6348-1e6c-395d-475a233de80b.1562829123; ci=59; PHPSESSID=nhn07e1r1n9oajc1ej3v4v8er3; Hm_lvt_f66b37722f586a240d4621318a5a6ebe=1568298023; Hm_lpvt_f66b37722f586a240d4621318a5a6ebe=1568298023; cssVersion=c3ad7e95; uuid_update=true; pushToken=0PTEye2MCahYqwz010SbhEGgUF8dr6pveNGaRFnxlJ3c*; isNewCome=1; IJSESSIONID=naw7ir3cnvwfg5o3o127449x; iuuid=61ADFD82525B2276FFCD8FD5E468656291EB433CE7EC2A8434F1BF6125D8AA35; cityname=%E6%88%90%E9%83%BD; _lxsdk=61ADFD82525B2276FFCD8FD5E468656291EB433CE7EC2A8434F1BF6125D8AA35; __utma=74597006.742821845.1555040388.1571712803.1571712803.1; __utmc=74597006; __utmz=74597006.1571712803.1.1.utmcsr=(direct)|utmccn=(direct)|utmcmd=(none); ci3=1; i_extend=H__a100001__b1; u=74293087; n=%E6%9A%96%E6%B4%8B%E6%B4%8B780; lt=Pxd4W47VjdorJdY-Qs4r0rEFjEoAAAAAVAkAAEblXap8JtOLIKqbabMh1AaulNrmblM4kitHSR9Wr44XiLBiUK09aXgFsHz7wDhD5Q; unc=%E6%9A%96%E6%B4%8B%E6%B4%8B780; lat=39.8655; lng=116.57676; firstTime=1577779818810; wpush_server_url=wss://wpush.meituan.com; acctId=57396785; brandId=-1; isOfflineSelfOpen=0; city_id=0; isChain=1; existBrandPoi=true; ignore_set_router_proxy=true; region_id=; region_version=0; newCategory=false; bsid=ubkO2RZRklE5Mhx5plDp5sw3PmdlL-lEgF90ORUM2nftSnKRHW6qas5r_P5cD6gKYUEFdqwq6B5OmIcoWvFITw; cityId=510100; provinceId=510000; city_location_id=0; location_id=0; igateApp=shangouepc; token=07-rPReTAv3zyn8KmJ3j0BGhdPMjX-NtV9lergp-rX14*; device_uuid=!99973228-2370-4ea8-8963-d97a4b996372; wmPoiId=2461723; wmPoiName=%E4%BA%AC%E8%A5%BF%E8%8F%9C%E5%B8%82%EF%BC%88%E6%8A%9A%E7%90%B4%E5%93%81%E8%B4%A8%E5%BA%97%EF%BC%89; logistics_support=1; set_info=%7B%22wmPoiId%22%3A2461723%2C%22ignoreSetRouterProxy%22%3Atrue%7D; JSESSIONID=b6vmlh6yfbwcinb21amavei; shopCategory=market; _lxsdk_s=16f788b94cc-e59-145-809%7C57396785%7C7" autonaviKey = "ef64f638f31e05cb7bde28790f7309fe"