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

尽量去除VendorIDWSC与VendorIDJX相关的无用代码

Browse Source
This commit is contained in:
gazebo
2019-11-05 17:21:21 +08:00
parent 00431b701d
commit 444e3dadd9
11 changed files with 36 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/partner/purchase/jx/jx_test.go
View File

@@ -33,7 +33,7 @@ func TestBuildNewJxOrder(t *testing.T) {
msg := &CallbackMsg{
AppKey: appKey,
MsgType: MsgTypeOrder,
SubMsgType: SubMsgTypeOrderNew,
SubMsgType: utils.Int2Str(model.OrderStatusNew),
ThingID: order.VendorOrderID,
Data: utils.Format4Output(order2, true),
}

71
business/partner/purchase/weimob/wsc/order.go
View File

@@ -2,7 +2,6 @@ package wsc
import (
"errors"
"sort"
"time"
"git.rosy.net.cn/baseapi/platformapi/weimobapi"
@@ -263,75 +262,7 @@ func (p *PurchaseHandler) postFakeMsg(orderNo int64, fakeStatus string) {
}
func (p *PurchaseHandler) arrangeSaleStore(order *model.GoodsOrder, cityName, provinceName string) {
globals.SugarLogger.Debugf("arrangeSaleStore orderID:%s cityName:%s, provinceName:%s", order.VendorOrderID, cityName, provinceName)
const (
maxTryStoreWhenArrange = 5
)
db := dao.GetDB()
var selectedStore *model.Store
if true {
if storeDetail, err := dao.GetStoreDetailByVendorStoreID(db, order.VendorStoreID, model.VendorIDWSC); err == nil {
selectedStore = &storeDetail.Store
}
} else {
storeList, err := dao.GetPossibleStoresByPlaceName(db, cityName, provinceName)
if err != nil {
globals.SugarLogger.Errorf("arrangeSaleStore failed with error:%v", err)
}
globals.SugarLogger.Debugf("arrangeSaleStore possible stores orderID:%s", order.VendorOrderID)
for _, store := range storeList {
globals.SugarLogger.Debugf("orderID:%s %s:%d", order.VendorOrderID, store.Name, store.ID)
}
if len(storeList) > 0 {
distanceList := make(utils.SortList, 0)
userLng := jxutils.IntCoordinate2Standard(order.ConsigneeLng)
userLat := jxutils.IntCoordinate2Standard(order.ConsigneeLat)
for k, store := range storeList {
// 展示门店自身不参与派单
if store.VendorStoreID != order.VendorStoreID {
sortItem := &utils.SortItem{
CompareValue: int64(jxutils.EarthDistance(userLng, userLat, jxutils.IntCoordinate2Standard(store.Lng), jxutils.IntCoordinate2Standard(store.Lat)) * 1000),
Index: k,
}
distanceList = append(distanceList, sortItem)
}
}
sort.Sort(distanceList)
globals.SugarLogger.Debugf("arrangeSaleStore distance list orderID:%s", order.VendorOrderID)
for _, dist := range distanceList {
globals.SugarLogger.Debugf("orderID:%s %s:%d, distance:%d", order.VendorOrderID, storeList[dist.Index].Name, storeList[dist.Index].ID, dist.CompareValue)
}
if len(distanceList) > maxTryStoreWhenArrange {
distanceList = distanceList[:maxTryStoreWhenArrange]
}
for _, v := range distanceList {
selectedStore = &storeList[v.Index].Store
if selectedStore.DeliveryRangeType == model.DeliveryRangeTypeRadius {
distance := v.CompareValue
if distance < utils.Str2Int64(selectedStore.DeliveryRange) {
break
} else {
globals.SugarLogger.Debugf("arrangeSaleStore orderID:%s distance:%d, deliveryRange:%d", order.VendorOrderID, distance, utils.Str2Int64(selectedStore.DeliveryRange))
}
} else {
points := jxutils.CoordinateStr2Points(selectedStore.DeliveryRange)
if utils.IsPointInPolygon(userLng, userLat, points) {
break
} else {
globals.SugarLogger.Debugf("arrangeSaleStore orderID:%s userLng:%f, userLat:%f, deliveryRange:%s", order.VendorOrderID, userLng, userLat, selectedStore.DeliveryRange)
}
}
selectedStore = nil
}
}
}
if selectedStore != nil {
order.StoreID = selectedStore.ID
order.StoreName = selectedStore.Name
globals.SugarLogger.Debugf("arrangeSaleStore orderID:%s arranged to store:%d", order.VendorOrderID, selectedStore.ID)
} else {
globals.SugarLogger.Errorf("arrangeSaleStore orderID:%s 找不到门店", order.VendorOrderID)
}
}
func (p *PurchaseHandler) setStoreOrderSeq(order *model.GoodsOrder) {