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

订单新消息修改

Browse Source
This commit is contained in:
苏尹岚
2020-05-25 10:23:53 +08:00
parent 429c252997
commit 350feaf265
3 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
business/jxstore/tempop/tempop.go
View File

@@ -1559,28 +1559,42 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
// }
// }
//京东商城街道code
var stores []*model.Store
//京东商城街道name
// var stores []*model.Store
// sql := `
// SELECT b.*
// FROM store_map a, store b
// WHERE a.store_id = b.id
// AND a.vendor_store_id = '' AND a.vendor_id = 5 AND a.deleted_at = ?
// AND b.deleted_at = ?
// `
// sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue}
// err = dao.GetRows(db, &stores, sql, sqlParams)
// for _, v := range stores {
// result, _ := api.AutonaviAPI.GetCoordinateAreaInfo(jxutils.IntCoordinate2Standard(v.Lng), jxutils.IntCoordinate2Standard(v.Lat))
// if result["regeocode"] != nil {
// street := result["regeocode"].(map[string]interface{})["addressComponent"].(map[string]interface{})["township"].(string)
// if street != "" {
// storeMaps, _ := dao.GetStoresMapList(db, []int{model.VendorIDJDShop}, []int{v.ID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "")
// storeMap := storeMaps[0]
// storeMap.JdsStreetName = street
// dao.UpdateEntity(db, storeMap, "JdsStreetName")
// }
// }
// }
var stores []*model.StoreMap
sql := `
SELECT b.*
SELECT a.*
FROM store_map a, store b
WHERE a.store_id = b.id
AND a.vendor_store_id = '' AND a.vendor_id = 5 AND a.deleted_at = ?
AND b.deleted_at = ?
WHERE a.store_id = b.id
AND a.vendor_store_id = '' AND a.vendor_id = 5 AND a.deleted_at = ?
AND b.deleted_at = ?
`
sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue}
err = dao.GetRows(db, &stores, sql, sqlParams)
for _, v := range stores {
result, _ := api.AutonaviAPI.GetCoordinateAreaInfo(jxutils.IntCoordinate2Standard(v.Lng), jxutils.IntCoordinate2Standard(v.Lat))
if result["regeocode"] != nil {
street := result["regeocode"].(map[string]interface{})["addressComponent"].(map[string]interface{})["township"].(string)
if street != "" {
storeMaps, _ := dao.GetStoresMapList(db, []int{model.VendorIDJDShop}, []int{v.ID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "")
storeMap := storeMaps[0]
storeMap.JdsStreetName = street
dao.UpdateEntity(db, storeMap, "JdsStreetName")
}
}
api.JdShopAPI.GetCity(parentID)
}
return err
}

16
business/jxutils/smsmsg/smsmsg.go
View File

@@ -80,10 +80,20 @@ func NotifyOrderCanceled(order *model.GoodsOrder) (err error) {
}
func isPushSMS(order *model.GoodsOrder) bool {
stores, _ := dao.GetStoreList(dao.GetDB(), []int{order.StoreID}, nil, nil, nil, "")
storeID := 0
if order.StoreID == 0 {
storeID = order.JxStoreID
} else {
storeID = order.StoreID
}
stores, _ := dao.GetStoresMapList(dao.GetDB(), []int{order.VendorID}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "")
if len(stores) > 0 {
if stores[0].SMSNotifyMark == model.NO {
return true
if stores[0].IsOrder == model.NO {
if storeID == model.MatterStoreID {
return false
} else {
return true
}
} else {
return false
}

2
business/partner/purchase/jd/store.go
View File

@@ -173,7 +173,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
}
if store.JdDistrictCode != 0 {
storeParams.County = store.JdDistrictCode
//彭州市做特殊处理
//TODO 彭州市做特殊处理 2020-05-25
if store.JdDistrictCode == 49318 {
storeParams.City = 49318
storeParams.County = 310045