From ec612b807be548fcac82e80081bcb10b8c8a310e Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 26 Aug 2019 17:31:56 +0800 Subject: [PATCH 1/4] - fk --- business/jxcallback/orderman/waybill.go | 6 +++++- business/jxstore/cms/authz.go | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/orderman/waybill.go b/business/jxcallback/orderman/waybill.go index b655f74c7..246db13c5 100644 --- a/business/jxcallback/orderman/waybill.go +++ b/business/jxcallback/orderman/waybill.go @@ -99,8 +99,12 @@ func (w *OrderManager) OnWaybillStatusChanged(bill *model.Waybill) (err error) { duplicatedCount = 1 } } else { + existingBill, err2 := w.LoadWaybill(bill.VendorWaybillID, bill.WaybillVendorID) + // todo + if err2 == nil { + bill.DeliveryFlag = existingBill.DeliveryFlag + } if bill.Status == model.WaybillStatusAccepted { // 处理美团配送丢失新运单消息的情况 - existingBill, err2 := w.LoadWaybill(bill.VendorWaybillID, bill.WaybillVendorID) if err2 != nil { if dao.IsNoRowsError(err2) || err2 == ErrCanNotFindWaybill { existingBill = bill diff --git a/business/jxstore/cms/authz.go b/business/jxstore/cms/authz.go index 487065ba5..a047328f6 100644 --- a/business/jxstore/cms/authz.go +++ b/business/jxstore/cms/authz.go @@ -15,6 +15,7 @@ import ( // todo 是否需要将Store.MarketManPhone与OperatorPhone成角色？ func TransferLegacyWeixins(mobile string) (err error) { + globals.SugarLogger.Debugf("TransferLegacyWeixins mobile:%s", mobile) if !globals.EnableWXAuth2 { return nil } From 139d3fec0f87df2cf08e6212318f623bf7e4f9cd Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 26 Aug 2019 17:47:40 +0800 Subject: [PATCH 2/4] - fk --- business/jxstore/cms/authz.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/cms/authz.go b/business/jxstore/cms/authz.go index a047328f6..945f2c249 100644 --- a/business/jxstore/cms/authz.go +++ b/business/jxstore/cms/authz.go @@ -45,7 +45,7 @@ func TransferLegacyWeixins(mobile string) (err error) { } else { sql += " t2.id IS NULL OR (t1.openid <> '' AND t3.id IS NULL) OR (t1.openid_mini <> '' AND t4.id IS NULL)" } - sql += `ORDER BY t1.parentid;` + sql += " ORDER BY t1.parentid;" var weixinList []*legacymodel.WeiXins db := dao.GetDB() err = dao.GetRows(db, &weixinList, sql, sqlParams...) From b1d7cb8f1826d66301e4357bdee8c57065cc1c07 Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 26 Aug 2019 18:37:53 +0800 Subject: [PATCH 3/4] - fk --- business/jxstore/cms/user.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/jxstore/cms/user.go b/business/jxstore/cms/user.go index 70e47f06c..79f8f490c 100644 --- a/business/jxstore/cms/user.go +++ b/business/jxstore/cms/user.go @@ -111,6 +111,7 @@ func BindMobile2Store(ctx *jxcontext.Context, mobile string, storeID int) (num i dao.Commit(db) } } else { + globals.SugarLogger.Debug(utils.Format4Output(user, false)) dao.WrapAddIDCULEntity(user, ctx.GetUserName()) user.ParentID = -1 if err = dao.CreateWeiXins(db, user); err == nil { From 0eaa99bb622a9475d5b4028a3f49206725256dcd Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 26 Aug 2019 18:53:12 +0800 Subject: [PATCH 4/4] =?UTF-8?q?-=20GetStores=E4=B8=AD=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E8=87=B3=E7=99=BE=E5=BA=A6=E5=9D=90=E6=A0=87OK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 48 ++++++++++++++++++----------------- business/jxstore/cms/user.go | 4 +-- conf/app.conf | 3 +++ globals/api/api.go | 3 +++ 4 files changed, 33 insertions(+), 25 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 64633514d..9562e34e2 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -13,6 +13,8 @@ import ( "git.rosy.net.cn/jx-callback/business/auth2" "git.rosy.net.cn/jx-callback/business/authz" + "git.rosy.net.cn/baseapi/platformapi/autonavi" + "git.rosy.net.cn/baseapi/platformapi/baidunavi" "git.rosy.net.cn/baseapi/platformapi/dingdingapi" "git.rosy.net.cn/baseapi/platformapi/jdapi" "git.rosy.net.cn/baseapi/utils" @@ -406,29 +408,29 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa retVal.Stores = retVal.Stores[offset : offset+pageSize] } if needConver2Baidu { - // task := tasksch.NewParallelTask("坐标转换", tasksch.NewParallelConfig().SetParallelCount(4).SetBatchSize(autonavi.MaxConvertCount), ctx, - // func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { - // var coords []*autonavi.Coordinate - // for _, v := range batchItemList { - // store := v.(*StoreExt) - // coords = append(coords, &autonavi.Coordinate{ - // Lng: store.FloatLng, - // Lat: store.FloatLat, - // }) - // } - // coords, err = api.AutonaviAPI.BatchCoordinateConvert(coords, autonavi.CoordSysBaidu) - // if err == nil { - // for k, v := range batchItemList { - // store := v.(*StoreExt) - // coord := coords[k] - // store.FloatLng = coord.Lng - // store.FloatLat = coord.Lat - // } - // } - // return retVal, err - // }, retVal.Stores) - // task.Run() - // task.GetResult(0) + task := tasksch.NewParallelTask("坐标转换", tasksch.NewParallelConfig().SetParallelCount(4).SetBatchSize(autonavi.MaxConvertCount), ctx, + func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { + var coords []*baidunavi.Coordinate + for _, v := range batchItemList { + store := v.(*StoreExt) + coords = append(coords, &baidunavi.Coordinate{ + Lng: store.FloatLng, + Lat: store.FloatLat, + }) + } + coords, err = api.BaiDuNaviAPI.BatchCoordinateConvert(coords, baidunavi.CoordSysGCJ02, baidunavi.CoordSysBaiDu) + if err == nil { + for k, v := range batchItemList { + store := v.(*StoreExt) + coord := coords[k] + store.FloatLng = coord.Lng + store.FloatLat = coord.Lat + } + } + return retVal, err + }, retVal.Stores) + task.Run() + task.GetResult(0) } // if mapLimit { // retVal.TotalCount = len(retVal.Stores) diff --git a/business/jxstore/cms/user.go b/business/jxstore/cms/user.go index 79f8f490c..05fb5b8bc 100644 --- a/business/jxstore/cms/user.go +++ b/business/jxstore/cms/user.go @@ -34,7 +34,7 @@ func GetStoreUsers(ctx *jxcontext.Context, storeID int) (storeUserInfos []*dao.S WHERE t1.parentid = -1 AND t1.jxstoreid = ? GROUP BY 1,2,3,4,5,6,7; ` - globals.SugarLogger.Debug(sql) + // globals.SugarLogger.Debug(sql) if err = dao.GetRows(nil, &storeUserInfos, sql, storeID); err == nil { for _, storeUserInfo := range storeUserInfos { if storeUserInfo.MembersStr != "" { @@ -111,7 +111,7 @@ func BindMobile2Store(ctx *jxcontext.Context, mobile string, storeID int) (num i dao.Commit(db) } } else { - globals.SugarLogger.Debug(utils.Format4Output(user, false)) + // globals.SugarLogger.Debug(utils.Format4Output(user, false)) dao.WrapAddIDCULEntity(user, ctx.GetUserName()) user.ParentID = -1 if err = dao.CreateWeiXins(db, user); err == nil { diff --git a/conf/app.conf b/conf/app.conf index 6aa563bcb..c809a05f0 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -18,6 +18,9 @@ mtwmCallbackURL = "http://callback.jxc4.com" autonaviKey = "4427170f870af2110becb8852d36ab08" +baidunaviAK = "eL94zToVOdGDTkNQxV8dnEQ1ZRcB2UKb" +baidunaviSK = "ZG0OOpOsOVURUwAkkmoHQFKRCbzn0zGb" + disableElm = true disableWeimob = true diff --git a/globals/api/api.go b/globals/api/api.go index dd14840a1..c6e2f761b 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -5,6 +5,7 @@ import ( "git.rosy.net.cn/baseapi/platformapi" "git.rosy.net.cn/baseapi/platformapi/autonavi" + "git.rosy.net.cn/baseapi/platformapi/baidunavi" "git.rosy.net.cn/baseapi/platformapi/dadaapi" "git.rosy.net.cn/baseapi/platformapi/dingdingapi" "git.rosy.net.cn/baseapi/platformapi/ebaiapi" @@ -42,6 +43,7 @@ var ( WeixinPageAPI *weixinapi.API // 用户微信扫码登录 AutonaviAPI *autonavi.API + BaiDuNaviAPI *baidunavi.API QiniuAPI *qbox.Mac ShowAPI *showapi.API WeimobAPI *weimobapi.API @@ -138,6 +140,7 @@ func Init() { WeixinPageAPI = weixinapi.New(beego.AppConfig.String("weixinPageAppID"), beego.AppConfig.String("weixinPageSecret")) AutonaviAPI = autonavi.New(beego.AppConfig.String("autonaviKey")) + BaiDuNaviAPI = baidunavi.New(beego.AppConfig.String("baidunaviAK"), beego.AppConfig.String("baidunaviSK")) QiniuAPI = qbox.NewMac(beego.AppConfig.String("qiniuAK"), beego.AppConfig.String("qiniuSK")) ShowAPI = showapi.New(beego.AppConfig.DefaultInt("showAppID", 0), beego.AppConfig.DefaultString("showAppSecret", "")) Cacher = redis.New(beego.AppConfig.DefaultString("redisHost", "localhost"), beego.AppConfig.DefaultInt("redisPort", 0), beego.AppConfig.DefaultString("redisPassword", ""))