liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2024-10-09 17:42:53 +08:00
parent f5e1c062ff
commit 46e8b26ef8
3 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
business/jxstore/cms/store.go
View File

@@ -6014,9 +6014,7 @@ func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDis
StoreSkuInfos []StoreSkuInfo
homePages []HomePageInfos
)
beginTime := time.Now()
locationList, err := common.GetStoreListByLocation(ctx, lng, lat, 20000, needWalkDistance, false, 0)
baseapi.SugarLogger.Infof("GetTopSkusByStoreIDs usedMilliSecond------2:%d", time.Now().Sub(beginTime)/time.Millisecond)
if err != nil {
return nil, "经纬度获取推荐门店失败", err
}
@@ -6048,7 +6046,6 @@ func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDis
StoreSkuInfos = append(StoreSkuInfos, storeSkuInfo)
}
baseapi.SugarLogger.Infof("GetTopSkusByStoreIDs usedMilliSecond------3:%d", time.Now().Sub(beginTime)/time.Millisecond)
for _, v := range filterStore {
//获取门店品牌信息
brandInfos, err := dao.GetStoreBrandInfos(v.ID)
@@ -6059,7 +6056,6 @@ func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDis
if scores, err := GetWeeklyStoreScore(v.ID, 0); err == nil && len(scores) > 0 {
storeScore = scores[0].TotalScore
}
baseapi.SugarLogger.Infof("GetTopSkusByStoreIDs usedMilliSecond------3.5:%d,%s", time.Now().Sub(beginTime)/time.Millisecond, v.ID)
storeInfo := StoreInfo{
StoreID: v.ID,
@@ -6081,7 +6077,6 @@ func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDis
if err != nil {
return nil, "获取门店减免策略失败", err
}
baseapi.SugarLogger.Infof("GetTopSkusByStoreIDs usedMilliSecond------3.6:%d", time.Now().Sub(beginTime)/time.Millisecond)
for _, k := range storePolicy {
if k.StoreID == v.ID {
storeDeductionInfo = StoreDeductionInfo{
@@ -6093,10 +6088,8 @@ func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDis
storeDeductionInfos = append(storeDeductionInfos, storeDeductionInfo)
}
//}
baseapi.SugarLogger.Infof("GetTopSkusByStoreIDs usedMilliSecond------3.7:%d", time.Now().Sub(beginTime)/time.Millisecond)
}
baseapi.SugarLogger.Infof("GetTopSkusByStoreIDs usedMilliSecond------4:%d", time.Now().Sub(beginTime)/time.Millisecond)
for _, i := range storeInfos {
homePage := HomePageInfos{}

12
business/partner/purchase/mtwm/order.go
View File

@@ -63,6 +63,7 @@ var (
mtwmapi.OrderStatusFinished: model.OrderStatusFinished,
mtwmapi.OrderStatusCanceled: model.OrderStatusCanceled,
mtwmapi.MsgTypeOrderModified: model.OrderStatusAdjust, // 用户调整订单
//mtwmapi.MsgTypeOrderFinancial: model.OrderStatusUnknown, // 用户调整订单
fakeFinishedPickup: model.OrderStatusFinishedPickup,
fakeOrderAdjustFinished: model.OrderStatusAdjust,
@@ -368,10 +369,13 @@ func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmap
order, orderObj, err2 := c.getOrder(msg.AppID, GetOrderIDFromMsg(msg), GetVendorStoreIDFromMsg(msg))
localOrder, _ := partner.CurOrderManager.LoadOrder(GetOrderIDFromMsg(msg), model.VendorIDMTWM)
if localOrder == nil {
localOrder = order
partner.CurOrderManager.OnOrderNew(order, status)
partner.CurOrderManager.SaveOrder(order, false, dao.GetDB())
partner.CurOrderManager.OnOrderMsg(localOrder, fmt.Sprintf("订单重新创建,加入监视器,检查是否会自动拣货[%s]", order.VendorOrderID), "")
return nil
// 会存在用户没支付订单,但是订单已经创建了,这个时候有可能会取消订单,所以这个地方直接退出不管了
// 等到美团推送新订单的时候再创建订单
/* localOrder = order
partner.CurOrderManager.OnOrderNew(order, status)
partner.CurOrderManager.SaveOrder(order, false, dao.GetDB())
partner.CurOrderManager.OnOrderMsg(localOrder, fmt.Sprintf("订单重新创建,加入监视器,检查是否会自动拣货[%s]", order.VendorOrderID), "")*/
}
if err2 == nil {
switch msg.Cmd {

9
controllers/cms_store.go
View File

@@ -4,14 +4,11 @@ import (
"bytes"
"encoding/json"
"errors"
"git.rosy.net.cn/baseapi"
"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
"git.rosy.net.cn/jx-callback/business/authz/autils"
"git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/business/partner/purchase/mtwm"
"strings"
"time"
"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
"git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/business/partner/purchase/tao_vegetable"
@@ -653,9 +650,7 @@ func (c *StoreController) GetStoreListByLocation() {
// @router /GetHomePageByLocation [get]
func (c *StoreController) GetHomePageByLocation() {
c.callGetHomePageByLocation(func(params *tStoreGetHomePageByLocationParams) (interface{}, string, error) {
beginTime := time.Now()
details, _, err := cms.GetHomePageByLocation(params.Ctx, params.Lng, params.Lat, params.NeedWalkDistance)
baseapi.SugarLogger.Infof("GetTopSkusByStoreIDs usedMilliSecond------1:%d", time.Now().Sub(beginTime)/time.Millisecond)
if err != nil {
return nil, "根据经纬度获取门店详细信息失败", err
}