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

- trim store deliveryRange(possible additional ;)

Browse Source
This commit is contained in:
gazebo
2018-11-14 12:11:43 +08:00
parent ec1a3deee6
commit f9e8e4745a
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
business/partner/purchase/ebai/store.go
View File

@@ -147,6 +147,8 @@ func (p *PurchaseHandler) ReadStore(vendorStoreID string) (*model.Store, error)
}
func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName string) (err error) {
globals.SugarLogger.Debugf("ebai UpdateStore storeID:%d, userName:%s", storeID, userName)
var stores []*tEbaiStoreInfo
sql := `
SELECT t1.*, t2.status ebai_store_status, t2.vendor_store_id,
@@ -279,17 +281,19 @@ func EbaiDeliveryRegion2Jx(deliveryRegion interface{}) string {
}
func JxDeliveryRegion2Ebai(store *model.Store) interface{} {
rangeStr := store.DeliveryRange
rangeStr := strings.Trim(store.DeliveryRange, ";")
if store.DeliveryRangeType == model.DeliveryRangeTypeRadius {
rangeStr = jxutils.GetPolygonFromCircleStr(jxutils.IntCoordinate2Standard(store.Lng), jxutils.IntCoordinate2Standard(store.Lat), utils.Str2Float64(store.DeliveryRange), 8)
}
pointPairs := strings.Split(rangeStr, ";")
region := make([]map[string]interface{}, len(pointPairs))
for k, v := range pointPairs {
region := make([]map[string]interface{}, 0)
for _, v := range pointPairs {
pointPair := strings.Split(v, ",")
region[k] = map[string]interface{}{
"longitude": utils.Str2Float64(pointPair[0]),
"latitude": utils.Str2Float64(pointPair[1]),
if len(pointPair) == 2 {
region = append(region, map[string]interface{}{
"longitude": utils.Str2Float64(pointPair[0]),
"latitude": utils.Str2Float64(pointPair[1]),
})
}
}
deliveryRegion := []interface{}{