From 66869ed853599a9eb63764380fc04a8347267555 Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 3 Apr 2019 18:35:34 +0800 Subject: [PATCH 1/6] - afterSaleBillStatus --- controllers/jd_callback.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/controllers/jd_callback.go b/controllers/jd_callback.go index b6033d962..3552b254a 100644 --- a/controllers/jd_callback.go +++ b/controllers/jd_callback.go @@ -146,7 +146,7 @@ func (c *DjswController) StoreCrud() { func (c *DjswController) transferResponse(inCallbackResponse *jdapi.CallbackResponse) (outCallbackResponse *jdapi.CallbackResponse) { if inCallbackResponse == nil { - return jdapi.Err2CallbackResponse(nil, "") + return jdapi.SuccessResponse } return inCallbackResponse } @@ -155,11 +155,10 @@ func (c *DjswController) afterSaleBillStatus() { var obj *jdapi.CallbackOrderMsg var callbackResponse *jdapi.CallbackResponse obj, callbackResponse = api.JdAPI.GetOrderCallbackMsg(c.Ctx.Input.RequestBody) - callbackResponse = jd.OnAfterSaleMsg(obj) if callbackResponse == nil { - callbackResponse = jdapi.SuccessResponse + callbackResponse = jd.OnAfterSaleMsg(obj) } - c.Data["json"] = callbackResponse + c.Data["json"] = c.transferResponse(callbackResponse) c.ServeJSON() } From d20d6e1df43095df170146a6926d51eecfb5921f Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 3 Apr 2019 20:22:19 +0800 Subject: [PATCH 2/6] =?UTF-8?q?-=20=E6=9F=A5=E8=AF=A2=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=AD=97=E5=9C=A8=E9=97=A8=E5=BA=97=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E4=B8=AD=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 78d1aecac..d29821b51 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -149,8 +149,8 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa } if keyword != "" { keywordLike := "%" + keyword + "%" - sqlWhere += " AND (t1.name LIKE ? OR t1.tel1 LIKE ? OR t1.tel2 LIKE ? OR t1.last_operator LIKE ? OR city.name LIKE ?" - sqlWhereParams = append(sqlWhereParams, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike) + sqlWhere += " AND (t1.name LIKE ? OR t1.tel1 LIKE ? OR t1.tel2 LIKE ? OR t1.last_operator LIKE ? OR city.name LIKE ? OR t1.address LIKE ?" + sqlWhereParams = append(sqlWhereParams, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike) if keywordInt64, err2 := strconv.ParseInt(keyword, 10, 64); err2 == nil { if jxutils.IsLegalMobileNumber(keywordInt64) { From 886fde0800d77b6dbf67fb2e6e1252978b5e69f0 Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 3 Apr 2019 20:30:11 +0800 Subject: [PATCH 3/6] =?UTF-8?q?-=20=E5=90=8C=E6=AD=A5=E7=BE=8E=E5=9B=A2?= =?UTF-8?q?=E5=A4=96=E5=8D=96=E9=97=A8=E5=BA=97=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/mtwm/store.go | 91 +++++++++++++------------ 1 file changed, 47 insertions(+), 44 deletions(-) diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go index 6f2284970..85b71eaea 100644 --- a/business/partner/purchase/mtwm/store.go +++ b/business/partner/purchase/mtwm/store.go @@ -12,6 +12,7 @@ import ( "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/partner" + "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" ) @@ -102,55 +103,57 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin if err != nil { return err } - // remoteStoreInfo, err := api.MtwmAPI.PoiGet(storeDetail.VendorStoreID) - // if err != nil { - // return err - // } + remoteStoreInfo, err := api.MtwmAPI.PoiGet(storeDetail.VendorStoreID) + if err != nil { + return err + } openTime := [][2]int16{[2]int16{storeDetail.OpenTime1, storeDetail.CloseTime1}} if storeDetail.OpenTime2 > 0 { openTime = append(openTime, [2]int16{storeDetail.OpenTime2, storeDetail.CloseTime2}) } - // params := map[string]interface{}{ - // "name": utils.Interface2String(remoteStoreInfo["name"]), //jxutils.ComposeStoreName(storeDetail.Store.Name, model.VendorIDMTWM), - // "phone": storeDetail.Tel1, - // "shipping_fee": jxutils.IntPrice2Standard(int64(storeDetail.DeliveryFee)), - // "shipping_time": openTimeJX2Mtwm(openTime), - // "third_tag_name": "蔬菜", - // } - // if storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreAddress) != 0 { - // params["address"] = storeDetail.Address - // params["longitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lng) - // params["latitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lat) - // } - // params["open_level"], params["is_online"] = bizStatusJX2Mtwm(jxutils.MergeStoreStatus(storeDetail.Status, storeDetail.VendorStatus)) - // globals.SugarLogger.Debug(utils.Format4Output(params, false)) - // if globals.EnableStoreWrite && globals.EnableMtwmStoreWrite { - // err = api.MtwmAPI.PoiSave(storeDetail.VendorStoreID, params) - // } - openLevel, isOnline := bizStatusJX2Mtwm(jxutils.MergeStoreStatus(storeDetail.Status, storeDetail.VendorStatus)) - if isOnline != mtwmapi.PoiStatusOnline { - err = api.MtwmAPI.PoiOffline(storeDetail.VendorStoreID) - } else { - if err = api.MtwmAPI.PoiOnline(storeDetail.VendorStoreID); err == nil { - // 这个函数成功返回也并不表示上线成功。。。 - remoteStoreInfo, err2 := api.MtwmAPI.PoiGet(storeDetail.VendorStoreID) - if err = err2; err != nil { - return err - } - if int(utils.MustInterface2Int64(remoteStoreInfo["is_online"])) == mtwmapi.PoiStatusOnline { - if openLevel == mtwmapi.PoiOpenLevelHaveRest { - err = api.MtwmAPI.PoiClose(storeDetail.VendorStoreID) - } else { - err = api.MtwmAPI.PoiOpen(storeDetail.VendorStoreID) - } - if err == nil { - err = api.MtwmAPI.PoiShipTimeUpdate(storeDetail.VendorStoreID, openTimeJX2Mtwm(openTime)) - } - } else { - err = errors.New("门店还未上线，不能修改营业状态") - } - } + params := map[string]interface{}{ + "name": utils.Interface2String(remoteStoreInfo["name"]), //jxutils.ComposeStoreName(storeDetail.Store.Name, model.VendorIDMTWM), + "phone": storeDetail.Tel1, + "shipping_fee": jxutils.IntPrice2Standard(int64(storeDetail.DeliveryFee)), + "shipping_time": openTimeJX2Mtwm(openTime), + "third_tag_name": "蔬菜", } + if storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreAddress) != 0 { + params["address"] = storeDetail.Address + params["longitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lng) + params["latitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lat) + } + params["open_level"], params["is_online"] = bizStatusJX2Mtwm(jxutils.MergeStoreStatus(storeDetail.Status, storeDetail.VendorStatus)) + globals.SugarLogger.Debug(utils.Format4Output(params, false)) + if globals.EnableMtwmStoreWrite { + err = api.MtwmAPI.PoiSave(storeDetail.VendorStoreID, params) + } + // openLevel, isOnline := bizStatusJX2Mtwm(jxutils.MergeStoreStatus(storeDetail.Status, storeDetail.VendorStatus)) + // if globals.EnableMtwmStoreWrite { + // if isOnline != mtwmapi.PoiStatusOnline { + // err = api.MtwmAPI.PoiOffline(storeDetail.VendorStoreID) + // } else { + // if err = api.MtwmAPI.PoiOnline(storeDetail.VendorStoreID); err == nil { + // // 这个函数成功返回也并不表示上线成功。。。 + // remoteStoreInfo, err2 := api.MtwmAPI.PoiGet(storeDetail.VendorStoreID) + // if err = err2; err != nil { + // return err + // } + // if int(utils.MustInterface2Int64(remoteStoreInfo["is_online"])) == mtwmapi.PoiStatusOnline { + // if openLevel == mtwmapi.PoiOpenLevelHaveRest { + // err = api.MtwmAPI.PoiClose(storeDetail.VendorStoreID) + // } else { + // err = api.MtwmAPI.PoiOpen(storeDetail.VendorStoreID) + // } + // if err == nil { + // err = api.MtwmAPI.PoiShipTimeUpdate(storeDetail.VendorStoreID, openTimeJX2Mtwm(openTime)) + // } + // } else { + // err = errors.New("门店还未上线，不能修改营业状态") + // } + // } + // } + // } return err } From 2d54c5510e4cd8ccd59d41834d5a125c6b01c5d6 Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 3 Apr 2019 20:34:43 +0800 Subject: [PATCH 4/6] - up --- business/partner/purchase/mtwm/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go index 85b71eaea..675d2b242 100644 --- a/business/partner/purchase/mtwm/store.go +++ b/business/partner/purchase/mtwm/store.go @@ -118,7 +118,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin "shipping_time": openTimeJX2Mtwm(openTime), "third_tag_name": "蔬菜", } - if storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreAddress) != 0 { + if true { //storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreAddress) != 0 { params["address"] = storeDetail.Address params["longitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lng) params["latitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lat) From 2c457a38d5387ff5b56cb250866847ecfe53a9d2 Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 3 Apr 2019 20:42:02 +0800 Subject: [PATCH 5/6] =?UTF-8?q?-=20=E4=BF=AE=E6=94=B9=E7=BE=8E=E5=9B=A2?= =?UTF-8?q?=E5=A4=96=E5=8D=96=E9=97=A8=E5=BA=97=E8=A6=81=E6=8A=A5=E9=94=99?= =?UTF-8?q?"=E5=95=86=E5=AE=B6=E5=B7=B2=E6=8E=A5=E5=85=A5=E7=BE=8E?= =?UTF-8?q?=E5=9B=A2=E9=85=8D=E9=80=81=EF=BC=8C=E4=B8=8D=E5=8F=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=97=A8=E5=BA=97=E9=85=8D=E9=80=81=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=A1=E6=81=AF"=EF=BC=8C=E8=BF=98=E6=98=AF=E5=8F=AA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E5=BA=97=E7=8A=B6=E6=80=81=E4=B8=8E?= =?UTF-8?q?=E8=90=A5=E4=B8=9A=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/mtwm/store.go | 93 +++++++++++++------------ 1 file changed, 47 insertions(+), 46 deletions(-) diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go index 675d2b242..987931332 100644 --- a/business/partner/purchase/mtwm/store.go +++ b/business/partner/purchase/mtwm/store.go @@ -103,57 +103,58 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin if err != nil { return err } - remoteStoreInfo, err := api.MtwmAPI.PoiGet(storeDetail.VendorStoreID) - if err != nil { - return err - } openTime := [][2]int16{[2]int16{storeDetail.OpenTime1, storeDetail.CloseTime1}} if storeDetail.OpenTime2 > 0 { openTime = append(openTime, [2]int16{storeDetail.OpenTime2, storeDetail.CloseTime2}) } - params := map[string]interface{}{ - "name": utils.Interface2String(remoteStoreInfo["name"]), //jxutils.ComposeStoreName(storeDetail.Store.Name, model.VendorIDMTWM), - "phone": storeDetail.Tel1, - "shipping_fee": jxutils.IntPrice2Standard(int64(storeDetail.DeliveryFee)), - "shipping_time": openTimeJX2Mtwm(openTime), - "third_tag_name": "蔬菜", - } - if true { //storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreAddress) != 0 { - params["address"] = storeDetail.Address - params["longitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lng) - params["latitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lat) - } - params["open_level"], params["is_online"] = bizStatusJX2Mtwm(jxutils.MergeStoreStatus(storeDetail.Status, storeDetail.VendorStatus)) - globals.SugarLogger.Debug(utils.Format4Output(params, false)) - if globals.EnableMtwmStoreWrite { - err = api.MtwmAPI.PoiSave(storeDetail.VendorStoreID, params) - } - // openLevel, isOnline := bizStatusJX2Mtwm(jxutils.MergeStoreStatus(storeDetail.Status, storeDetail.VendorStatus)) - // if globals.EnableMtwmStoreWrite { - // if isOnline != mtwmapi.PoiStatusOnline { - // err = api.MtwmAPI.PoiOffline(storeDetail.VendorStoreID) - // } else { - // if err = api.MtwmAPI.PoiOnline(storeDetail.VendorStoreID); err == nil { - // // 这个函数成功返回也并不表示上线成功。。。 - // remoteStoreInfo, err2 := api.MtwmAPI.PoiGet(storeDetail.VendorStoreID) - // if err = err2; err != nil { - // return err - // } - // if int(utils.MustInterface2Int64(remoteStoreInfo["is_online"])) == mtwmapi.PoiStatusOnline { - // if openLevel == mtwmapi.PoiOpenLevelHaveRest { - // err = api.MtwmAPI.PoiClose(storeDetail.VendorStoreID) - // } else { - // err = api.MtwmAPI.PoiOpen(storeDetail.VendorStoreID) - // } - // if err == nil { - // err = api.MtwmAPI.PoiShipTimeUpdate(storeDetail.VendorStoreID, openTimeJX2Mtwm(openTime)) - // } - // } else { - // err = errors.New("门店还未上线，不能修改营业状态") - // } - // } - // } + openLevel, isOnline := bizStatusJX2Mtwm(jxutils.MergeStoreStatus(storeDetail.Status, storeDetail.VendorStatus)) + // remoteStoreInfo, err := api.MtwmAPI.PoiGet(storeDetail.VendorStoreID) + // if err != nil { + // return err // } + // params := map[string]interface{}{ + // "name": utils.Interface2String(remoteStoreInfo["name"]), //jxutils.ComposeStoreName(storeDetail.Store.Name, model.VendorIDMTWM), + // "phone": storeDetail.Tel1, + // "shipping_fee": jxutils.IntPrice2Standard(int64(storeDetail.DeliveryFee)), + // "shipping_time": openTimeJX2Mtwm(openTime), + // "third_tag_name": "蔬菜", + // } + // if true { //storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreAddress) != 0 { + // params["address"] = storeDetail.Address + // params["longitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lng) + // params["latitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lat) + // } + // params["open_level"] = openLevel + // params["is_online"] = isOnline + // globals.SugarLogger.Debug(utils.Format4Output(params, false)) + // if globals.EnableMtwmStoreWrite { + // err = api.MtwmAPI.PoiSave(storeDetail.VendorStoreID, params) + // } + if globals.EnableMtwmStoreWrite { + if isOnline != mtwmapi.PoiStatusOnline { + err = api.MtwmAPI.PoiOffline(storeDetail.VendorStoreID) + } else { + if err = api.MtwmAPI.PoiOnline(storeDetail.VendorStoreID); err == nil { + // 这个函数成功返回也并不表示上线成功。。。 + remoteStoreInfo, err2 := api.MtwmAPI.PoiGet(storeDetail.VendorStoreID) + if err = err2; err != nil { + return err + } + if int(utils.MustInterface2Int64(remoteStoreInfo["is_online"])) == mtwmapi.PoiStatusOnline { + if openLevel == mtwmapi.PoiOpenLevelHaveRest { + err = api.MtwmAPI.PoiClose(storeDetail.VendorStoreID) + } else { + err = api.MtwmAPI.PoiOpen(storeDetail.VendorStoreID) + } + if err == nil { + err = api.MtwmAPI.PoiShipTimeUpdate(storeDetail.VendorStoreID, openTimeJX2Mtwm(openTime)) + } + } else { + err = errors.New("门店还未上线，不能修改营业状态") + } + } + } + } return err } From 5986c5ad17e0cb1836f1227bf01c32dbcce1a883 Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 4 Apr 2019 12:36:00 +0800 Subject: [PATCH 6/6] =?UTF-8?q?-=20=E9=A5=BF=E7=99=BE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/ebai/store.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/business/partner/purchase/ebai/store.go b/business/partner/purchase/ebai/store.go index 6f25ab70f..2a731944a 100644 --- a/business/partner/purchase/ebai/store.go +++ b/business/partner/purchase/ebai/store.go @@ -182,11 +182,11 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin mergeStatus := jxutils.MergeStoreStatus(store.Status, store.EbaiStoreStatus) if store2.Status != mergeStatus { if mergeStatus == model.StoreStatusOpened { - err = api.EbaiAPI.ShopOnline("", utils.Str2Int64(store.VendorStoreID)) - } else if mergeStatus == model.StoreStatusClosed { - err = api.EbaiAPI.ShopOffline("", utils.Str2Int64(store.VendorStoreID)) + err = api.EbaiAPI.ShopOpen("", utils.Str2Int64(store.VendorStoreID)) } else if mergeStatus == model.StoreStatusClosed { err = api.EbaiAPI.ShopClose("", utils.Str2Int64(store.VendorStoreID)) + } else if mergeStatus == model.StoreStatusDisabled { + err = api.EbaiAPI.ShopOffline("", utils.Str2Int64(store.VendorStoreID)) } if intErr, ok := err.(*utils.ErrorWithCode); ok && intErr.IntCode() == 201100 { err = nil