From dd9a0740c89ddab1cbb9fc46e0842a1c64be56b9 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 19 Aug 2022 14:24:34 +0800 Subject: [PATCH 01/20] =?UTF-8?q?tl=20=E6=94=AF=E4=BB=98=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/jx/localjx/order.go | 2 +- business/partner/purchase/jx/localjx/tiktokPay.go | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index 43bcf7b79..0d4ddd2d2 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -334,7 +334,7 @@ func Pay4Order(ctx *jxcontext.Context, orderID int64, payType int, vendorPayType err = dao.CreateEntity(dao.GetDB(), orderPay) } case model.PayTypeTicTok: - if orderPay, err = pay4OrderByTT(ctx, order, vendorPayType); err == nil && orderPay != nil { + if orderPay, err = pay4OrderByTT(ctx, order, vendorPayType, subAppID); err == nil && orderPay != nil { dao.WrapAddIDCULDEntity(orderPay, ctx.GetUserName()) err = dao.CreateEntity(dao.GetDB(), orderPay) } diff --git a/business/partner/purchase/jx/localjx/tiktokPay.go b/business/partner/purchase/jx/localjx/tiktokPay.go index 592506384..25457a480 100644 --- a/business/partner/purchase/jx/localjx/tiktokPay.go +++ b/business/partner/purchase/jx/localjx/tiktokPay.go @@ -18,9 +18,9 @@ func getOrderBriefTt(order *model.GoodsOrder) string { return fmt.Sprintf("%s等共%d件商品", order.Skus[0].SkuName, order.GoodsCount) } -func pay4OrderByTT(ctx *jxcontext.Context, order *model.GoodsOrder, vendorPayType string) (orderPay *model.OrderPay, err error) { +func pay4OrderByTT(ctx *jxcontext.Context, order *model.GoodsOrder, vendorPayType, subAppID string) (orderPay *model.OrderPay, err error) { param := &tiktok.TickTokCreateOrder{ - AppID: api.TiktokApi.GetAppID(), + //AppID: api.TiktokApi.GetAppID(), OutOrderNo: utils.Int64ToStr(GenPayOrderID(order)), TotalAmount: int(order.ActualPayPrice), Subject: "蔬菜水果日用品", @@ -29,7 +29,15 @@ func pay4OrderByTT(ctx *jxcontext.Context, order *model.GoodsOrder, vendorPayTyp CpExtra: "msg", NotifyURL: globals.TictokpayNotifyURL, } - + if subAppID == tiktok.TiktokJXDJAppID { + param = &tiktok.TickTokCreateOrder{ + AppID: api.TiktokJXDJApi.GetAppID(), + } + } else { + param = &tiktok.TickTokCreateOrder{ + AppID: api.TiktokApi.GetAppID(), + } + } ttOrderId, orderToken, err := api.TiktokApi.CreateOrderByTicktock(param) if err == nil { orderPay = &model.OrderPay{ From 7e93a1fbe866e4e91d61ace468a0973c321e4585 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 19 Aug 2022 14:36:05 +0800 Subject: [PATCH 02/20] =?UTF-8?q?tl=20=E6=94=AF=E4=BB=98=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/jx/localjx/tiktokPay.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/business/partner/purchase/jx/localjx/tiktokPay.go b/business/partner/purchase/jx/localjx/tiktokPay.go index 25457a480..d00abcdc5 100644 --- a/business/partner/purchase/jx/localjx/tiktokPay.go +++ b/business/partner/purchase/jx/localjx/tiktokPay.go @@ -30,13 +30,9 @@ func pay4OrderByTT(ctx *jxcontext.Context, order *model.GoodsOrder, vendorPayTyp NotifyURL: globals.TictokpayNotifyURL, } if subAppID == tiktok.TiktokJXDJAppID { - param = &tiktok.TickTokCreateOrder{ - AppID: api.TiktokJXDJApi.GetAppID(), - } + param.AppID = api.TiktokJXDJApi.GetAppID() } else { - param = &tiktok.TickTokCreateOrder{ - AppID: api.TiktokApi.GetAppID(), - } + param.AppID = api.TiktokApi.GetAppID() } ttOrderId, orderToken, err := api.TiktokApi.CreateOrderByTicktock(param) if err == nil { From 6062df98cc200a03ecbdc8075665392798e56983 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 19 Aug 2022 14:46:11 +0800 Subject: [PATCH 03/20] =?UTF-8?q?tl=20=E6=94=AF=E4=BB=98=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/jx/localjx/tiktokPay.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/jx/localjx/tiktokPay.go b/business/partner/purchase/jx/localjx/tiktokPay.go index d00abcdc5..134e05ebd 100644 --- a/business/partner/purchase/jx/localjx/tiktokPay.go +++ b/business/partner/purchase/jx/localjx/tiktokPay.go @@ -34,7 +34,7 @@ func pay4OrderByTT(ctx *jxcontext.Context, order *model.GoodsOrder, vendorPayTyp } else { param.AppID = api.TiktokApi.GetAppID() } - ttOrderId, orderToken, err := api.TiktokApi.CreateOrderByTicktock(param) + ttOrderId, orderToken, err := getTikTok(subAppID).CreateOrderByTicktock(param) if err == nil { orderPay = &model.OrderPay{ PayOrderID: ttOrderId, // 抖音订单id @@ -52,7 +52,13 @@ func pay4OrderByTT(ctx *jxcontext.Context, order *model.GoodsOrder, vendorPayTyp } return orderPay, err } - +func getTikTok(appID string) (TikTokMini *tiktok.API) { + TikTokMini = api.TiktokApi + if len(appID) > 0 && appID == api.TiktokJXDJApiID { + TikTokMini = api.TiktokJXDJApi + } + return TikTokMini +} func OnTTPayCallback(msg *tiktok.DetailCallBackMessage, refund *tiktok.DetailCallBackMessage2Refund, payType string) (err error) { globals.SugarLogger.Debugf("OnTTPayCallback msg:%s", utils.Format4Output(msg, true)) switch payType { From fcf6a2e2fd773ef9524a7c654ef8b9a65f9802ed Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 19 Aug 2022 14:54:28 +0800 Subject: [PATCH 04/20] =?UTF-8?q?tl=20=E6=94=AF=E4=BB=98=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/auth2/authprovider/douyin/tiktop_mini.go | 2 -- business/partner/purchase/jx/localjx/tiktokPay.go | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/business/auth2/authprovider/douyin/tiktop_mini.go b/business/auth2/authprovider/douyin/tiktop_mini.go index 41c3ec5cf..4de2ea799 100644 --- a/business/auth2/authprovider/douyin/tiktop_mini.go +++ b/business/auth2/authprovider/douyin/tiktop_mini.go @@ -96,10 +96,8 @@ func getWxApp(appID string) (miniApi *weixinapi.API) { func getTikTokApp(appID string) (TikTokMini *tiktok.API) { TikTokMini = api.TiktokApi if len(appID) > 0 && appID == api.TiktokJXDJApiID { - globals.SugarLogger.Debug("我进入这里了") TikTokMini = api.TiktokJXDJApi } - globals.SugarLogger.Debug("输出一下TikTokMini", TikTokMini) return TikTokMini } func splitCode(code string) (appID, realCode string) { diff --git a/business/partner/purchase/jx/localjx/tiktokPay.go b/business/partner/purchase/jx/localjx/tiktokPay.go index 134e05ebd..0b2450b17 100644 --- a/business/partner/purchase/jx/localjx/tiktokPay.go +++ b/business/partner/purchase/jx/localjx/tiktokPay.go @@ -34,6 +34,7 @@ func pay4OrderByTT(ctx *jxcontext.Context, order *model.GoodsOrder, vendorPayTyp } else { param.AppID = api.TiktokApi.GetAppID() } + globals.SugarLogger.Debug("打印param", param) ttOrderId, orderToken, err := getTikTok(subAppID).CreateOrderByTicktock(param) if err == nil { orderPay = &model.OrderPay{ @@ -57,6 +58,7 @@ func getTikTok(appID string) (TikTokMini *tiktok.API) { if len(appID) > 0 && appID == api.TiktokJXDJApiID { TikTokMini = api.TiktokJXDJApi } + globals.SugarLogger.Debug("输出TikTokMini", TikTokMini) return TikTokMini } func OnTTPayCallback(msg *tiktok.DetailCallBackMessage, refund *tiktok.DetailCallBackMessage2Refund, payType string) (err error) { From 019f3632683a012758cd33f5bed77aca4244ba55 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 19 Aug 2022 15:29:20 +0800 Subject: [PATCH 05/20] =?UTF-8?q?tl=20=E6=94=AF=E4=BB=98=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/jx/localjx/tiktokPay.go | 1 - 1 file changed, 1 deletion(-) diff --git a/business/partner/purchase/jx/localjx/tiktokPay.go b/business/partner/purchase/jx/localjx/tiktokPay.go index 0b2450b17..ebac7bfc9 100644 --- a/business/partner/purchase/jx/localjx/tiktokPay.go +++ b/business/partner/purchase/jx/localjx/tiktokPay.go @@ -41,7 +41,6 @@ func pay4OrderByTT(ctx *jxcontext.Context, order *model.GoodsOrder, vendorPayTyp PayOrderID: ttOrderId, // 抖音订单id PayType: model.PayTypeTicTok, VendorPayType: vendorPayType, - VendorOrderID: order.VendorOrderID, VendorID: order.VendorID, Status: 0, From 4eb9a1a1c25e7f0466e247882a6ae8c98da90517 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 19 Aug 2022 16:39:22 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=B6=85=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/jx/localjx/order.go | 3 ++- business/partner/purchase/jx/localjx/order_test.go | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index 0d4ddd2d2..345108783 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -1555,6 +1555,7 @@ func changeOrderStatus(vendorOrderID string, status int, remark string) (err err StatusTime: time.Now(), Remark: remark, } + globals.SugarLogger.Debug("检测数据orderStatus.Status", status, orderStatus.Status) jxutils.CallMsgHandlerAsync(func() { err = partner.CurOrderManager.OnOrderStatusChanged("", orderStatus) }, jxutils.ComposeUniversalOrderID(vendorOrderID, model.VendorIDJX)) @@ -1719,7 +1720,7 @@ func CancelPayTimeOutOrder(ctx *jxcontext.Context) (err error) { AND vendor_id = ? ` sqlParams := []interface{}{ - time.Now().Add(-time.Minute * 30), + time.Now().Add(-time.Minute * 1), model.OrderStatusWait4Pay, model.VendorIDJX, } diff --git a/business/partner/purchase/jx/localjx/order_test.go b/business/partner/purchase/jx/localjx/order_test.go index d3eea832a..2d1070fc6 100644 --- a/business/partner/purchase/jx/localjx/order_test.go +++ b/business/partner/purchase/jx/localjx/order_test.go @@ -17,8 +17,8 @@ func init() { func TestGenOrderNo(t *testing.T) { loc, _ := time.LoadLocation("Local") - t1, _ := time.ParseInLocation("20060102150405", time.Unix(1654510539,0).Format("20060102150405"), loc) - fmt.Println("t1",t1) + t1, _ := time.ParseInLocation("20060102150405", time.Unix(1654510539, 0).Format("20060102150405"), loc) + fmt.Println("t1", t1) } func TestGetAvailableDeliverTime(t *testing.T) { @@ -28,3 +28,7 @@ func TestGetAvailableDeliverTime(t *testing.T) { } t.Log(utils.Format4Output(timeInfo, false)) } +func TestChangeStatus(t *testing.T) { + err := changeOrderStatus("88398619646640", 115, "") + fmt.Println(err) +} From b49200b69bf0d78b06448373345d8326ea3de887 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 22 Aug 2022 10:20:47 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E8=BF=90=E8=B4=B9=E5=87=8F=E5=85=8D?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/jx/localjx/order.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index 345108783..c4768d014 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -1019,7 +1019,11 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64 // 订单超过一千配送费优惠(门店运费) discountPrice, err := cms.GetStoreVendorMaps(ctx, nil, jxOrder.StoreID, -1) if len(discountPrice) == 1 && outJxOrder.OrderPrice >= int64(discountPrice[0].DeliveryFeeDeductionSill) { - outJxOrder.FreightPrice = outJxOrder.FreightPrice - int64(discountPrice[0].DeliveryFeeDeductionFee) + if outJxOrder.FreightPrice-int64(discountPrice[0].DeliveryFeeDeductionFee) >= 0 { + outJxOrder.FreightPrice = outJxOrder.FreightPrice - int64(discountPrice[0].DeliveryFeeDeductionFee) + } else { + outJxOrder.FreightPrice = 0 + } } // ?????????????????????? 测试 if storeDetail.ID == 668470 || storeDetail.ID == 668469 { @@ -1720,7 +1724,7 @@ func CancelPayTimeOutOrder(ctx *jxcontext.Context) (err error) { AND vendor_id = ? ` sqlParams := []interface{}{ - time.Now().Add(-time.Minute * 1), + time.Now().Add(-time.Minute * 30), model.OrderStatusWait4Pay, model.VendorIDJX, } From 32fbf9491bdbab0dd207d1e4a600299bb8df46bb Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 22 Aug 2022 10:41:45 +0800 Subject: [PATCH 08/20] =?UTF-8?q?wx=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/auth2/auth2.go | 2 ++ controllers/auth2.go | 1 + 2 files changed, 3 insertions(+) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index f838bfffc..9457d05cb 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -396,11 +396,13 @@ func AddAuthBind(user IUser, newAuthInfo *AuthInfo) (err error) { func AddAuthBindWithMobile(authInfo *AuthInfo, mobile string) (err error) { if handler := authers[authInfo.AuthBindInfo.Type]; handler != nil { user, err := dao.GetUserByID(dao.GetDB(), "mobile", mobile) + globals.SugarLogger.Debug("user===============", user) if err != nil { return errors.New("此接口有执行顺序，请先调用注册登录接口：【第一步：Login，第二不：TiktokDecrypt】") } authInfo.AuthBindInfo.UserID = user.UserID //handler.UnbindAuth(user.GetID(), newAuthInfo.GetAuthType(), newAuthInfo.GetAuthTypeID(), user.GetName()) + globals.SugarLogger.Debug("authInfo.AuthBindInfo,user.GetName()===============", authInfo.AuthBindInfo, user.GetName()) err = handler.AddAuthBind(authInfo.AuthBindInfo, user.GetName()) } else { err = ErrIllegalAuthType diff --git a/controllers/auth2.go b/controllers/auth2.go index 27ac53507..16dd72bdd 100644 --- a/controllers/auth2.go +++ b/controllers/auth2.go @@ -343,6 +343,7 @@ func (c *Auth2Controller) AddAuthBindWithMobile() { if err != nil { return retVal, "", err } + globals.SugarLogger.Debug("打印newAuthInfo==============", newAuthInfo) err = auth2.AddAuthBindWithMobile(newAuthInfo, params.Mobile) return retVal, "", err }) From a0532efa09e356525aac659344965702803868fb Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 22 Aug 2022 11:19:10 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/jx/localjx/order.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index c4768d014..0c0e13c9f 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -1026,9 +1026,9 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64 } } // ?????????????????????? 测试 - if storeDetail.ID == 668470 || storeDetail.ID == 668469 { - outJxOrder.FreightPrice = 1 - } + //if storeDetail.ID == 668470 || storeDetail.ID == 668469 { + // outJxOrder.FreightPrice = 1 + //} if err == nil { if jxOrder.OrderType == model.OrderTypeNormal { outJxOrder.TotalPrice = outJxOrder.OrderPrice + outJxOrder.FreightPrice From 69bfa4e2f2d7c05346b2398428fa020564d63a8c Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 22 Aug 2022 16:44:29 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/auth2/auth2.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index 9457d05cb..bdcc9d794 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -377,6 +377,7 @@ func AddAuthBind(user IUser, newAuthInfo *AuthInfo) (err error) { } RemoveUserInfo(newAuthInfo.Token) if newAuthInfo.AuthBindInfo.Type == AuthTypeMobile { + globals.SugarLogger.Debug("进入AuthTypeMobile,输出newAuthInfo.AuthBindInfo.AuthID", newAuthInfo.AuthBindInfo.AuthID) err = userProvider.UpdateUserMobile(user.GetID(), newAuthInfo.AuthBindInfo.AuthID) } else if newAuthInfo.AuthBindInfo.Type == AuthTypeEmail { err = userProvider.UpdateUserEmail(user.GetID(), newAuthInfo.AuthBindInfo.AuthID) @@ -400,6 +401,7 @@ func AddAuthBindWithMobile(authInfo *AuthInfo, mobile string) (err error) { if err != nil { return errors.New("此接口有执行顺序，请先调用注册登录接口：【第一步：Login，第二不：TiktokDecrypt】") } + globals.SugarLogger.Debug("输出user.UserID", user.UserID) authInfo.AuthBindInfo.UserID = user.UserID //handler.UnbindAuth(user.GetID(), newAuthInfo.GetAuthType(), newAuthInfo.GetAuthTypeID(), user.GetName()) globals.SugarLogger.Debug("authInfo.AuthBindInfo,user.GetName()===============", authInfo.AuthBindInfo, user.GetName()) From c38a2dbc869fc089824bf14e550d8439ff37b4d3 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 22 Aug 2022 17:09:06 +0800 Subject: [PATCH 11/20] =?UTF-8?q?wx=E6=B3=A8=E5=86=8C=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/auth2/auth2.go | 1 + business/jxcallback/scheduler/defsch/defsch.go | 1 + controllers/auth2.go | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index bdcc9d794..3666fe313 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -282,6 +282,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string } } authInfo = createAuthInfo(user, authBindEx) + globals.SugarLogger.Debug("authInfo==================", authInfo) if user != nil && user.GetID() != "" { userProvider.UpdateLastLogin(user.GetID(), authType, ctx.GetRealRemoteIP()) } diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 781b3dd43..87da90454 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -1038,6 +1038,7 @@ func (s *DefScheduler) swtich2SelfDeliverWithRetry(savedOrderInfo *WatchOrderInf if retryCount > 0 { utils.AfterFuncWithRecover(duration, func() { jxutils.CallMsgHandlerAsync(func() { + s.SelfDeliverDelivering(order, "非专送、快送、混合送订单，转自送失败，调用deriving转自送") s.swtich2SelfDeliverWithRetry(savedOrderInfo, bill, retryCount-1, duration) }, jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID)) }) diff --git a/controllers/auth2.go b/controllers/auth2.go index 16dd72bdd..dcf855b97 100644 --- a/controllers/auth2.go +++ b/controllers/auth2.go @@ -116,6 +116,7 @@ func (c *Auth2Controller) TiktokDecrypt() { // @router /Login [post] func (c *Auth2Controller) Login() { c.callLogin(func(params *tAuth2LoginParams) (retVal interface{}, errCode string, err error) { + globals.SugarLogger.Debug("params.AuthType==============", params.AuthType) if params.AuthType == auth2.AuthTypeMobile { params.AuthIDType = auth2.UserIDMobile } else if params.AuthType == auth2.AuthTypeEmail { @@ -133,14 +134,18 @@ func (c *Auth2Controller) Login() { params.AuthSecret = GetComposedCode2(&c.Controller, params.AuthSecret) } ctx := auth2.NewContext(c.Ctx.ResponseWriter, c.Ctx.Request) + globals.SugarLogger.Debug("params.AuthType, params.AuthID, params.AuthIDType, params.AuthSecret==============", params.AuthType, params.AuthID, params.AuthIDType, params.AuthSecret) authInfo, err := auth2.Login(ctx, params.AuthType, params.AuthID, params.AuthIDType, params.AuthSecret) + globals.SugarLogger.Debug("authInfo==============", authInfo) // TODO 兼容没有取到authid2的错误 if err == nil && authInfo.AuthBindInfo != nil { if authInfo.AuthBindInfo.AuthID2 == "" { + globals.SugarLogger.Debug("fgfggggggg") authInfo.AuthBindInfo.AuthID2 = authInfo.AuthBindInfo.AuthID } retVal = authInfo } + globals.SugarLogger.Debug("retVal==============", retVal) return retVal, "", err }) } From ee74854165958ba9dd06876367d8eb8b2280dc1d Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 22 Aug 2022 17:24:30 +0800 Subject: [PATCH 12/20] =?UTF-8?q?wx=E6=B3=A8=E5=86=8C=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/auth2/auth2.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index 3666fe313..fdd440947 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -402,10 +402,8 @@ func AddAuthBindWithMobile(authInfo *AuthInfo, mobile string) (err error) { if err != nil { return errors.New("此接口有执行顺序，请先调用注册登录接口：【第一步：Login，第二不：TiktokDecrypt】") } - globals.SugarLogger.Debug("输出user.UserID", user.UserID) authInfo.AuthBindInfo.UserID = user.UserID //handler.UnbindAuth(user.GetID(), newAuthInfo.GetAuthType(), newAuthInfo.GetAuthTypeID(), user.GetName()) - globals.SugarLogger.Debug("authInfo.AuthBindInfo,user.GetName()===============", authInfo.AuthBindInfo, user.GetName()) err = handler.AddAuthBind(authInfo.AuthBindInfo, user.GetName()) } else { err = ErrIllegalAuthType From cce72fe054b44ed6cb95397749c6c8f4025574a4 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 23 Aug 2022 10:28:04 +0800 Subject: [PATCH 13/20] test --- business/partner/purchase/jx/localjx/order.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index 0c0e13c9f..c4768d014 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -1026,9 +1026,9 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64 } } // ?????????????????????? 测试 - //if storeDetail.ID == 668470 || storeDetail.ID == 668469 { - // outJxOrder.FreightPrice = 1 - //} + if storeDetail.ID == 668470 || storeDetail.ID == 668469 { + outJxOrder.FreightPrice = 1 + } if err == nil { if jxOrder.OrderType == model.OrderTypeNormal { outJxOrder.TotalPrice = outJxOrder.OrderPrice + outJxOrder.FreightPrice From 5b86b9d6b0a5a1c3b6b91fd2d9ecfb71a21c624b Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 23 Aug 2022 14:12:58 +0800 Subject: [PATCH 14/20] subID --- business/jxstore/cms/store.go | 54 ++++++++++++ business/partner/purchase/jx/localjx/order.go | 7 +- controllers/cms_store.go | 83 +++++++------------ 3 files changed, 88 insertions(+), 56 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index f280616d9..b78a80e4e 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6,6 +6,7 @@ import ( "encoding/json" "errors" "fmt" + "git.rosy.net.cn/jx-callback/business/jxstore/common" "git.rosy.net.cn/jx-callback/business/jxstore/event" "io" "math" @@ -5626,3 +5627,56 @@ func UpdateStoreTemplate(ctx *jxcontext.Context, storeID int, content, sound str _, err = dao.UpdateEntity(db, store, "PrinterTemplate", "PrinterSound") return err } + +//条件过滤 B2B、物料店 +func FilterByB2B(locationList []*common.Store4User, token string) (retVal interface{}, errCode string, err error) { + userAuth, err := auth2.GetTokenInfo(token) + if err != nil { + return nil, "", err + } + user, total, err := dao.GetUsers(dao.GetDB(), 1, "", []string{userAuth.UserID}, nil, nil, 0, 1) + if err != nil { + return nil, "", err + } + globals.SugarLogger.Debug("检测数据userAuth,user,total==============", userAuth, user, total) + // 获取位置附近门店列表 + storeIDs := make([]int, 0, len(locationList)) + for _, v := range locationList { + storeIDs = append(storeIDs, v.ID) + } + globals.SugarLogger.Debug("检测数据locationList,storeIDs==============", locationList, storeIDs) + // 判断门店是不是b2b门店，如果是，用户必须为系统管理员（门店老板和运营人员） + store, err := dao.GetStoreList(dao.GetDB(), storeIDs, nil, nil, nil, nil, "") + if err != nil { + return nil, "", err + } + + isMatterStore := false + for _, v := range storeIDs { + if v == model.MatterStoreID { + isMatterStore = true + } + } + + result := make([]*common.Store4User, 0, 0) + for _, v := range store { + for _, s := range locationList { + if v.ID == s.ID { + if (v.BrandID == model.B2BNumberId || isMatterStore) && user[0].Type == model.YES { // 普通用户进入物料店和b2b店 + continue + } else { + result = append(result, s) + } + } + } + } + + if total != model.YES { + return result, "", errors.New("") + } + if user[0].Type != model.YES { + return locationList, "", nil + } else { + return result, "", err + } +} diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index c4768d014..d7bf60768 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -3,7 +3,6 @@ package localjx import ( "errors" "fmt" - "git.rosy.net.cn/baseapi/platformapi/tiktok" "math" "regexp" "strings" @@ -326,9 +325,9 @@ func Pay4Order(ctx *jxcontext.Context, orderID int64, payType int, vendorPayType err = dao.CreateEntity(dao.GetDB(), orderPay) } case model.PayTypeTL: - if subAppID == tiktok.TiktokAppId || subAppID == tiktok.TiktokJXDJAppID { - subAppID = model.JXC4AppId // 京西商城 - } + //if subAppID == tiktok.TiktokAppId || subAppID == tiktok.TiktokJXDJAppID { + // subAppID = model.JXC4AppId // 京西商城 + //} if orderPay, err = pay4OrderByTL(ctx, order, payType, vendorPayType, subAppID); err == nil && orderPay != nil { dao.WrapAddIDCULDEntity(orderPay, ctx.GetUserName()) err = dao.CreateEntity(dao.GetDB(), orderPay) diff --git a/controllers/cms_store.go b/controllers/cms_store.go index dda4317b9..823dafb1f 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -1,9 +1,7 @@ package controllers import ( - "errors" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/auth2" "git.rosy.net.cn/jx-callback/business/jxstore/cms" "git.rosy.net.cn/jx-callback/business/jxstore/common" "git.rosy.net.cn/jx-callback/business/jxstore/misc" @@ -11,8 +9,6 @@ import ( "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/netprinter" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/model/dao" - "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/server/web" ) @@ -579,57 +575,10 @@ func (c *StoreController) SyncStoresCourierInfo() { func (c *StoreController) GetStoreListByLocation() { c.callGetStoreListByLocation(func(params *tStoreGetStoreListByLocationParams) (retVal interface{}, errCode string, err error) { locationList, err := common.GetStoreListByLocation(params.Ctx, params.Lng, params.Lat, 20000, params.NeedWalkDistance, false, params.BrandID) - //if params.Token == "tempToken" { - // return locationList, "", nil - //} if params.Token != "" { - // 获取用户权限，如果是普通用户不展示b2b相关目录，如果是门店老板或者管理则展示全部 - userAuth, err := auth2.GetTokenInfo(params.Token) + result, _, err := cms.FilterByB2B(locationList, params.Token) if err != nil { return nil, "", err - } - user, total, err := dao.GetUsers(dao.GetDB(), 1, "", []string{userAuth.UserID}, nil, nil, 0, 1) - if err != nil { - return nil, "", err - } - globals.SugarLogger.Debug("检测数据userAuth,user,total==============", userAuth, user, total) - // 获取位置附近门店列表 - storeIDs := make([]int, 0, len(locationList)) - for _, v := range locationList { - storeIDs = append(storeIDs, v.ID) - } - globals.SugarLogger.Debug("检测数据locationList,storeIDs==============", locationList, storeIDs) - // 判断门店是不是b2b门店，如果是，用户必须为系统管理员（门店老板和运营人员） - store, err := dao.GetStoreList(dao.GetDB(), storeIDs, nil, nil, nil, nil, "") - if err != nil { - return nil, "", err - } - - isMatterStore := false - for _, v := range storeIDs { - if v == model.MatterStoreID { - isMatterStore = true - } - } - - result := make([]*common.Store4User, 0, 0) - for _, v := range store { - for _, s := range locationList { - if v.ID == s.ID { - if (v.BrandID == model.B2BNumberId || isMatterStore) && user[0].Type == model.YES { // 普通用户进入物料店和b2b店 - continue - } else { - result = append(result, s) - } - } - } - } - - if total != model.YES { - return result, "", errors.New("") - } - if user[0].Type != model.YES { - return locationList, "", nil } else { return result, "", err } @@ -638,6 +587,36 @@ func (c *StoreController) GetStoreListByLocation() { }) } +// @Title 根据位置得到首页商店详细信息 +// @Description 根据位置得到首页商店详细信息 +// @Param token header string false "认证token" +// @Param lng query float64 true "经度" +// @Param lat query float64 true "纬度" +// @Param needWalkDistance query bool false "是否需要返回步行距离（且以步行距离排序）" +// @Param brandID query int false "品牌ID" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /GetHomePageByLocation [get] +func (c *StoreController) GetHomePageByLocation() { + c.callGetHomePageByLocation(func(params *tStoreGetHomePageByLocationParams) (interface{}, string, error) { + locationList, err := common.GetStoreListByLocation(params.Ctx, params.Lng, params.Lat, 20000, params.NeedWalkDistance, false, params.BrandID) + if err != nil { + return nil, "根据经纬度获取商店失败", err + } + if params.Token != "" { + // 获取用户权限，如普通用户不展示b2b相关目录，门店老板或者管理则展示全部 + result, _, err := cms.FilterByB2B(locationList, params.Token) + if err != nil { + return nil, "根据用户权限过滤商店失败", err + } + //获取店铺基本信息 + //storeDetail := cms.GetStores(params.Ctx, params.Keyword, params.MapData, params.Offset, params.PageSize, timeList[0], timeList[1], params.OrderCountFrom, params.OrderCountTo) + //retVal, err = cms.GetStoreVendorMaps(params.Ctx, nil, utils.Interface2String(), params.VendorID) + } + return locationList, "", err + }) +} + // @Title 老格恢复拓店进度 // @Description 老格恢复拓店进度 // @Param token header string true "认证token" From beea68cdddd0e1a162f0e350e49cb025aa499e05 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 23 Aug 2022 14:18:06 +0800 Subject: [PATCH 15/20] subID --- controllers/cms_store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 823dafb1f..9df54f952 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -605,7 +605,7 @@ func (c *StoreController) GetHomePageByLocation() { } if params.Token != "" { // 获取用户权限，如普通用户不展示b2b相关目录，门店老板或者管理则展示全部 - result, _, err := cms.FilterByB2B(locationList, params.Token) + //result, _, err := cms.FilterByB2B(locationList, params.Token) if err != nil { return nil, "根据用户权限过滤商店失败", err } From 69e681043e2aa0e1fcdec26e173a0fcdc67c4ad3 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 23 Aug 2022 17:51:46 +0800 Subject: [PATCH 16/20] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 48 ++++++++++++++++++++++++++++++++++- controllers/cms_store.go | 6 +---- controllers/cms_store_sku.go | 2 ++ 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index b78a80e4e..1d65ed5b5 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -121,6 +121,32 @@ type VendorStoreExcel struct { OperatorName3 string `json:"运营负责人3"` } +//首页展示信息 +type HomePageInfos struct { + StoreID int `json:"storeID"` //门店ID + StoreName string `json:"storeName"` //门店名字 + OpenTime1 int16 `json:"openTime1"` // 930就表示9点半，用两个的原因是为了支持中午休息，1与2的时间段不能交叉，为0表示没有 + CloseTime1 int16 `json:"closeTime1"` // 营业时间 1 + OpenTime2 int16 `json:"openTime2"` // 营业时间2 + CloseTime2 int16 `json:"closeTime2"` + Status int `json:"status"` //门店是否营业 + Distance int `json:"distance"` //店铺与定位 直线距离 + BrandID int `orm:"column(brand_id)" json:"brandID"` //品牌ID + BrandName string `json:"brandName"` //品牌名字 + BrandLogo string `json:"brandLogo"` //品牌logo + //热销商品信息 + SkuID int `json:"skuID"` //商品ID + SkuName string `json:"skuName"` //商品名字 + SkuStatus int `json:"skuStatus"` //商品是否可售状态 1可售 0不可售 + BestSeller int `json:"bestSeller"` //畅销品 0不是 1是 + Img string `json:"img"` //商品第一张图片 + Price int `json:"price"` // 单位为分，标准价，不为份的就为实际标准价，为份的为每市斤价，实际还要乘质量 + Unit string `json:"unit"` //商品售卖单位 份/kg等 + //减运策略 + DeliveryFeeDeductionSill int `json:"deliveryFeeDeductionSill"` //订单满减金额 + DeliveryFeeDeductionFee int `json:"deliveryFeeDeductionFee"` //订单减免金额 +} + type JdStoreLevelExt struct { Level string `json:"level` PageNo int `json:"pageNo"` @@ -5629,7 +5655,7 @@ func UpdateStoreTemplate(ctx *jxcontext.Context, storeID int, content, sound str } //条件过滤 B2B、物料店 -func FilterByB2B(locationList []*common.Store4User, token string) (retVal interface{}, errCode string, err error) { +func FilterByB2B(locationList []*common.Store4User, token string) (retVal []*common.Store4User, errCode string, err error) { userAuth, err := auth2.GetTokenInfo(token) if err != nil { return nil, "", err @@ -5680,3 +5706,23 @@ func FilterByB2B(locationList []*common.Store4User, token string) (retVal interf return result, "", err } } + +//首页信息展示 +//func GetHomePageByLocation(locationList []*common.Store4User, token string) (interface{}, string, error) { +// var ( +// //ctx *jxcontext.Context +// ) +// // 获取用户权限，如普通用户不展示b2b相关目录，门店老板或者管理则展示全部 +// result, _, err := FilterByB2B(locationList, token) +// if err != nil { +// return nil, "根据用户权限过滤商店失败", err +// } +// for _, v := range result { +// //获取门店信息 +// //storeInfos, err := GetStores(ctx, ) +// //获取热销商品 +// //获取满减策略 +// } +// +// return nil, "", nil +//} diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 9df54f952..688545da1 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -604,11 +604,7 @@ func (c *StoreController) GetHomePageByLocation() { return nil, "根据经纬度获取商店失败", err } if params.Token != "" { - // 获取用户权限，如普通用户不展示b2b相关目录，门店老板或者管理则展示全部 - //result, _, err := cms.FilterByB2B(locationList, params.Token) - if err != nil { - return nil, "根据用户权限过滤商店失败", err - } + //获取店铺基本信息 //storeDetail := cms.GetStores(params.Ctx, params.Keyword, params.MapData, params.Offset, params.PageSize, timeList[0], timeList[1], params.OrderCountFrom, params.OrderCountTo) //retVal, err = cms.GetStoreVendorMaps(params.Ctx, nil, utils.Interface2String(), params.VendorID) diff --git a/controllers/cms_store_sku.go b/controllers/cms_store_sku.go index ade3f399a..6fe6d6743 100644 --- a/controllers/cms_store_sku.go +++ b/controllers/cms_store_sku.go @@ -3,6 +3,7 @@ package controllers import ( "git.rosy.net.cn/jx-callback/business/auth2" "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/baseapi/platformapi/jdapi" @@ -53,6 +54,7 @@ type StoreSkuController struct { func (c *StoreSkuController) GetStoreSkus() { c.callGetStoreSkus(func(params *tStoreSkuGetStoreSkusParams) (retVal interface{}, errCode string, err error) { var skuIDs []int + globals.SugarLogger.Debug("检测param=============", params) if err = jxutils.Strings2Objs(params.SkuIDs, &skuIDs); err == nil { retVal, err = cms.GetStoreSkus(params.Ctx, params.StoreID, skuIDs, params.IsFocus, params.Keyword, params.IsBySku, params.IsAct, params.MapData, params.Offset, params.PageSize) } From ba7db2bffe90644fe5a2e89dd4cab58d3f354fe0 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 24 Aug 2022 09:24:26 +0800 Subject: [PATCH 17/20] param --- business/auth2/auth2.go | 6 ------ business/jxstore/cms/store.go | 7 +++---- controllers/cms_store.go | 2 ++ controllers/cms_store_sku.go | 5 +---- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index fdd440947..949f35afd 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -161,7 +161,6 @@ func getFixedTokenName(token string) *AuthInfo { func createAuthInfo(user IUser, authBindInfo *AuthBindEx) (authInfo *AuthInfo) { token, tokenType := createToken(user, authBindInfo) //user为空 tokenType=2 - globals.SugarLogger.Debug("token，tokenType,user============", token, tokenType, user) expireDuration := DefTokenDuration authInfo = &AuthInfo{ AuthBindInfo: authBindInfo, @@ -249,7 +248,6 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string } realAuthID = user.GetID() } - globals.SugarLogger.Debug("打印realAuthID检测是否为空==================", realAuthID) if authBindEx, err = handler.VerifySecret(realAuthID, authSecret); err == nil { globals.SugarLogger.Debugf("Login authBindEx", utils.Format4Output(authBindEx, false)) if authBindEx == nil { // mobile, email会返回nil（表示不会新建AuthBind实体） @@ -282,7 +280,6 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string } } authInfo = createAuthInfo(user, authBindEx) - globals.SugarLogger.Debug("authInfo==================", authInfo) if user != nil && user.GetID() != "" { userProvider.UpdateLastLogin(user.GetID(), authType, ctx.GetRealRemoteIP()) } @@ -378,14 +375,12 @@ func AddAuthBind(user IUser, newAuthInfo *AuthInfo) (err error) { } RemoveUserInfo(newAuthInfo.Token) if newAuthInfo.AuthBindInfo.Type == AuthTypeMobile { - globals.SugarLogger.Debug("进入AuthTypeMobile,输出newAuthInfo.AuthBindInfo.AuthID", newAuthInfo.AuthBindInfo.AuthID) err = userProvider.UpdateUserMobile(user.GetID(), newAuthInfo.AuthBindInfo.AuthID) } else if newAuthInfo.AuthBindInfo.Type == AuthTypeEmail { err = userProvider.UpdateUserEmail(user.GetID(), newAuthInfo.AuthBindInfo.AuthID) } else { if handler := authers[newAuthInfo.AuthBindInfo.Type]; handler != nil { newAuthInfo.AuthBindInfo.UserID = user.GetID() - globals.SugarLogger.Debug("进入AddAuthBind获取userID", newAuthInfo.AuthBindInfo.UserID) handler.UnbindAuth(user.GetID(), newAuthInfo.GetAuthType(), newAuthInfo.GetAuthTypeID(), user.GetName()) err = handler.AddAuthBind(newAuthInfo.AuthBindInfo, user.GetName()) } else { @@ -398,7 +393,6 @@ func AddAuthBind(user IUser, newAuthInfo *AuthInfo) (err error) { func AddAuthBindWithMobile(authInfo *AuthInfo, mobile string) (err error) { if handler := authers[authInfo.AuthBindInfo.Type]; handler != nil { user, err := dao.GetUserByID(dao.GetDB(), "mobile", mobile) - globals.SugarLogger.Debug("user===============", user) if err != nil { return errors.New("此接口有执行顺序，请先调用注册登录接口：【第一步：Login，第二不：TiktokDecrypt】") } diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 1d65ed5b5..581ae4f3b 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -5664,13 +5664,11 @@ func FilterByB2B(locationList []*common.Store4User, token string) (retVal []*com if err != nil { return nil, "", err } - globals.SugarLogger.Debug("检测数据userAuth,user,total==============", userAuth, user, total) // 获取位置附近门店列表 storeIDs := make([]int, 0, len(locationList)) for _, v := range locationList { storeIDs = append(storeIDs, v.ID) } - globals.SugarLogger.Debug("检测数据locationList,storeIDs==============", locationList, storeIDs) // 判断门店是不是b2b门店，如果是，用户必须为系统管理员（门店老板和运营人员） store, err := dao.GetStoreList(dao.GetDB(), storeIDs, nil, nil, nil, nil, "") if err != nil { @@ -5710,7 +5708,7 @@ func FilterByB2B(locationList []*common.Store4User, token string) (retVal []*com //首页信息展示 //func GetHomePageByLocation(locationList []*common.Store4User, token string) (interface{}, string, error) { // var ( -// //ctx *jxcontext.Context +// //ctx *jxcontext.Context // ) // // 获取用户权限，如普通用户不展示b2b相关目录，门店老板或者管理则展示全部 // result, _, err := FilterByB2B(locationList, token) @@ -5719,8 +5717,9 @@ func FilterByB2B(locationList []*common.Store4User, token string) (retVal []*com // } // for _, v := range result { // //获取门店信息 -// //storeInfos, err := GetStores(ctx, ) +// store, err := GetStores(ctx, ) // //获取热销商品 +// // //获取满减策略 // } // diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 688545da1..58e6d9abc 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -9,6 +9,7 @@ import ( "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/netprinter" "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/server/web" ) @@ -63,6 +64,7 @@ func (c *StoreController) GetStores() { if err != nil { return nil, "", err } + globals.SugarLogger.Debug("检测数据param", params) retVal, err = cms.GetStores(params.Ctx, params.Keyword, params.MapData, params.Offset, params.PageSize, timeList[0], timeList[1], params.OrderCountFrom, params.OrderCountTo) return retVal, "", err }) diff --git a/controllers/cms_store_sku.go b/controllers/cms_store_sku.go index 6fe6d6743..2e128570f 100644 --- a/controllers/cms_store_sku.go +++ b/controllers/cms_store_sku.go @@ -1,11 +1,9 @@ package controllers import ( + "git.rosy.net.cn/baseapi/platformapi/jdapi" "git.rosy.net.cn/jx-callback/business/auth2" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/globals" - - "git.rosy.net.cn/baseapi/platformapi/jdapi" "errors" "git.rosy.net.cn/jx-callback/business/jxstore/cms" @@ -54,7 +52,6 @@ type StoreSkuController struct { func (c *StoreSkuController) GetStoreSkus() { c.callGetStoreSkus(func(params *tStoreSkuGetStoreSkusParams) (retVal interface{}, errCode string, err error) { var skuIDs []int - globals.SugarLogger.Debug("检测param=============", params) if err = jxutils.Strings2Objs(params.SkuIDs, &skuIDs); err == nil { retVal, err = cms.GetStoreSkus(params.Ctx, params.StoreID, skuIDs, params.IsFocus, params.Keyword, params.IsBySku, params.IsAct, params.MapData, params.Offset, params.PageSize) } From 19ffeb61abd5e543f6aaac62ace902b5b3e3033a Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 24 Aug 2022 09:30:14 +0800 Subject: [PATCH 18/20] param --- controllers/cms_store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 58e6d9abc..3799ac3c4 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -64,7 +64,7 @@ func (c *StoreController) GetStores() { if err != nil { return nil, "", err } - globals.SugarLogger.Debug("检测数据param", params) + globals.SugarLogger.Debug("检测数据param", params.Ctx, params.Keyword, params.MapData, params.Offset, params.PageSize, timeList[0], timeList[1], params.OrderCountFrom, params.OrderCountTo) retVal, err = cms.GetStores(params.Ctx, params.Keyword, params.MapData, params.Offset, params.PageSize, timeList[0], timeList[1], params.OrderCountFrom, params.OrderCountTo) return retVal, "", err }) From fa9536fdce60690da54ec99fd05293b2bd8399e0 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 24 Aug 2022 09:48:05 +0800 Subject: [PATCH 19/20] param --- business/jxstore/cms/store.go | 5 +---- controllers/cms_store.go | 5 ++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 581ae4f3b..2cefaa465 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -5706,10 +5706,7 @@ func FilterByB2B(locationList []*common.Store4User, token string) (retVal []*com } //首页信息展示 -//func GetHomePageByLocation(locationList []*common.Store4User, token string) (interface{}, string, error) { -// var ( -// //ctx *jxcontext.Context -// ) +//func GetHomePageByLocation(ctx *jxcontext.Context,locationList []*common.Store4User, token string) (interface{}, string, error) { // // 获取用户权限，如普通用户不展示b2b相关目录，门店老板或者管理则展示全部 // result, _, err := FilterByB2B(locationList, token) // if err != nil { diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 3799ac3c4..68eb67892 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -64,7 +64,10 @@ func (c *StoreController) GetStores() { if err != nil { return nil, "", err } - globals.SugarLogger.Debug("检测数据param", params.Ctx, params.Keyword, params.MapData, params.Offset, params.PageSize, timeList[0], timeList[1], params.OrderCountFrom, params.OrderCountTo) + globals.SugarLogger.Debug("=================", params.Ctx) + globals.SugarLogger.Debug("=================", params.Keyword) + globals.SugarLogger.Debug("=================", params.MapData) + globals.SugarLogger.Debug("检测数据param", params.Offset, params.PageSize, timeList[0], timeList[1], params.OrderCountFrom, params.OrderCountTo) retVal, err = cms.GetStores(params.Ctx, params.Keyword, params.MapData, params.Offset, params.PageSize, timeList[0], timeList[1], params.OrderCountFrom, params.OrderCountTo) return retVal, "", err }) From 0219a7b02fac02ae994d46d143027b79a99858fb Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 24 Aug 2022 13:54:00 +0800 Subject: [PATCH 20/20] param --- business/jxstore/cms/store.go | 18 ++++++++--------- controllers/cms_store.go | 37 ++++++++++++++++------------------- 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 2cefaa465..b5c6c9535 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -545,6 +545,7 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa var storeIDs []int if err = utils.UnmarshalUseNumber([]byte(params["storeIDs"].(string)), &storeIDs); err == nil { for _, v := range storeIDs { + globals.SugarLogger.Debug("storeIDs===============", v) if storeIDsMap[v] != 0 { storeIDs2 = append(storeIDs2, v) } @@ -5706,19 +5707,16 @@ func FilterByB2B(locationList []*common.Store4User, token string) (retVal []*com } //首页信息展示 -//func GetHomePageByLocation(ctx *jxcontext.Context,locationList []*common.Store4User, token string) (interface{}, string, error) { -// // 获取用户权限，如普通用户不展示b2b相关目录，门店老板或者管理则展示全部 -// result, _, err := FilterByB2B(locationList, token) +//func GetHomePageByLocation(ctx *jxcontext.Context, params map[string]interface{}) (interface{}, string, error) { +// //获取门店信息 +// timeList, err := jxutils.BatchStr2Time("1970-01-01 00:00:00 +0800 CST", "1970-01-01 00:00:00 +0800 CST") // if err != nil { -// return nil, "根据用户权限过滤商店失败", err +// return nil, "", err // } -// for _, v := range result { -// //获取门店信息 -// store, err := GetStores(ctx, ) -// //获取热销商品 +// store, err := GetStores(ctx, "", params, 0, 0, timeList[0], timeList[1], 0, 0) +// //获取热销商品 // -// //获取满减策略 -// } +// //获取满减策略 // // return nil, "", nil //} diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 68eb67892..c9b3bd5cd 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -9,7 +9,6 @@ import ( "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/netprinter" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/server/web" ) @@ -64,10 +63,6 @@ func (c *StoreController) GetStores() { if err != nil { return nil, "", err } - globals.SugarLogger.Debug("=================", params.Ctx) - globals.SugarLogger.Debug("=================", params.Keyword) - globals.SugarLogger.Debug("=================", params.MapData) - globals.SugarLogger.Debug("检测数据param", params.Offset, params.PageSize, timeList[0], timeList[1], params.OrderCountFrom, params.OrderCountTo) retVal, err = cms.GetStores(params.Ctx, params.Keyword, params.MapData, params.Offset, params.PageSize, timeList[0], timeList[1], params.OrderCountFrom, params.OrderCountTo) return retVal, "", err }) @@ -597,26 +592,28 @@ func (c *StoreController) GetStoreListByLocation() { // @Param token header string false "认证token" // @Param lng query float64 true "经度" // @Param lat query float64 true "纬度" +//@Param storeID query string false "门店ID" // @Param needWalkDistance query bool false "是否需要返回步行距离（且以步行距离排序）" // @Param brandID query int false "品牌ID" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /GetHomePageByLocation [get] -func (c *StoreController) GetHomePageByLocation() { - c.callGetHomePageByLocation(func(params *tStoreGetHomePageByLocationParams) (interface{}, string, error) { - locationList, err := common.GetStoreListByLocation(params.Ctx, params.Lng, params.Lat, 20000, params.NeedWalkDistance, false, params.BrandID) - if err != nil { - return nil, "根据经纬度获取商店失败", err - } - if params.Token != "" { - - //获取店铺基本信息 - //storeDetail := cms.GetStores(params.Ctx, params.Keyword, params.MapData, params.Offset, params.PageSize, timeList[0], timeList[1], params.OrderCountFrom, params.OrderCountTo) - //retVal, err = cms.GetStoreVendorMaps(params.Ctx, nil, utils.Interface2String(), params.VendorID) - } - return locationList, "", err - }) -} +//func (c *StoreController) GetHomePageByLocation() { +// c.callGetHomePageByLocation(func(params *tStoreGetHomePageByLocationParams) (interface{}, string, error) { +// details, _, err := cms.GetHomePageByLocation(params.Ctx, params.MapData) +// if err != nil { +// return nil, "根据经纬度获取门店详细信息失败", err +// } +// if params.Token != "" { +// utils.Str2Int() +// //获取店铺基本信息 +// //storeDetail := cms.GetStores(params.Ctx, params.Keyword, params.MapData, params.Offset, params.PageSize, timeList[0], timeList[1], params.OrderCountFrom, params.OrderCountTo) +// //retVal, err = cms.GetStoreVendorMaps(params.Ctx, nil, utils.Interface2String(), params.VendorID) +// } +// //return locationList, "", err +// return nil, "", err +// }) +//} // @Title 老格恢复拓店进度 // @Description 老格恢复拓店进度