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

test

Browse Source
This commit is contained in:
苏尹岚
2020-11-19 15:02:32 +08:00
parent e58b124056
commit 6f3409b852
1 changed files with 139 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,8 +3,6 @@ package tempop
import ( import (
"bytes" "bytes"
"context" "context"
"encoding/base64"
"encoding/json"
"fmt" "fmt"
"regexp" "regexp"
"strings" "strings"
@@ -1648,67 +1646,67 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
// }, []int{0}) // }, []int{0})
// tasksch.HandleTask(task, nil, true).Run() // tasksch.HandleTask(task, nil, true).Run()
// _, err = task.GetResult(0) // _, err = task.GetResult(0)
var ( // var (
storeMaps []*model.StoreMap // storeMaps []*model.StoreMap
db = dao.GetDB() // db = dao.GetDB()
) // )
sql := ` // sql := `
SELECT * from store_map where vendor_id = 5 and deleted_at = '1970-01-01 00:00:00' and vendor_org_code = 2 and vendor_store_id = '' // SELECT * from store_map where vendor_id = 5 and deleted_at = '1970-01-01 00:00:00' and vendor_org_code = 2 and vendor_store_id = ''
` // `
err = dao.GetRows(db, &storeMaps, sql, nil) // err = dao.GetRows(db, &storeMaps, sql, nil)
for _, v := range storeMaps { // for _, v := range storeMaps {
store, _ := dao.GetStoreDetail(db, v.StoreID, model.VendorIDJDShop, "") // store, _ := dao.GetStoreDetail(db, v.StoreID, model.VendorIDJDShop, "")
data, _, _ := jxutils.DownloadFileByURL(jdshopapi.JdsStoreImg) // data, _, _ := jxutils.DownloadFileByURL(jdshopapi.JdsStoreImg)
timeMap := map[string]string{ // timeMap := map[string]string{
"businessBeginTime": int2TimeStr(int(store.OpenTime1)), // "businessBeginTime": int2TimeStr(int(store.OpenTime1)),
"businessEndTime": int2TimeStr(int(store.CloseTime1)), // "businessEndTime": int2TimeStr(int(store.CloseTime1)),
} // }
timeJSON, _ := json.Marshal(timeMap) // timeJSON, _ := json.Marshal(timeMap)
createEntityStoreParam := &jdshopapi.CreateEntityStoreParam{ // createEntityStoreParam := &jdshopapi.CreateEntityStoreParam{
Name: "京西菜市" + strings.ReplaceAll(store.Name, "店", "") + "生鲜店", // Name: "京西菜市" + strings.ReplaceAll(store.Name, "店", "") + "生鲜店",
AddCode: store.JdsCode, // AddCode: store.JdsCode,
AddCodeName: store.DistrictName, // AddCodeName: store.DistrictName,
AddName: store.ProvinceName + store.CityName + store.DistrictName + "@!" + store.Address, // AddName: store.ProvinceName + store.CityName + store.DistrictName + "@!" + store.Address,
Coordinate: utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lat)) + "," + utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lng)), // Coordinate: utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lat)) + "," + utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lng)),
Phone: store.Tel1, // Phone: store.Tel1,
ExtendJSON: string(timeJSON), // ExtendJSON: string(timeJSON),
ImageFile: base64.StdEncoding.EncodeToString(data), // ImageFile: base64.StdEncoding.EncodeToString(data),
CategoryName: "生鲜店", // CategoryName: "生鲜店",
CustomerID: utils.Int2Str(store.ID), // CustomerID: utils.Int2Str(store.ID),
} // }
if store.JdsStreetCode != 0 { // if store.JdsStreetCode != 0 {
createEntityStoreParam.AddCode = store.JdsStreetCode // createEntityStoreParam.AddCode = store.JdsStreetCode
} // }
if createEntityStoreParam.AddCode == 0 { // if createEntityStoreParam.AddCode == 0 {
createEntityStoreParam.AddCode = store.JdCode // createEntityStoreParam.AddCode = store.JdCode
} // }
//证明这个店可能隶属直辖市或者东莞 // //证明这个店可能隶属直辖市或者东莞
if model.ZXCityCodeMap[store.CityCode] != "" { // if model.ZXCityCodeMap[store.CityCode] != "" {
result, _ := api.AutonaviAPI.GetCoordinateAreaInfo(jxutils.IntCoordinate2Standard(store.Lng), jxutils.IntCoordinate2Standard(store.Lat)) // result, _ := api.AutonaviAPI.GetCoordinateAreaInfo(jxutils.IntCoordinate2Standard(store.Lng), jxutils.IntCoordinate2Standard(store.Lat))
if result["regeocode"] != nil { // if result["regeocode"] != nil {
street := result["regeocode"].(map[string]interface{})["addressComponent"].(map[string]interface{})["township"].(string) // street := result["regeocode"].(map[string]interface{})["addressComponent"].(map[string]interface{})["township"].(string)
if street != "" { // if street != "" {
result1, _ := api.JdShopAPI.GetProvince() // result1, _ := api.JdShopAPI.GetProvince()
for _, v := range result1 { // for _, v := range result1 {
if strings.Contains(store.CityName, v.AreaName) { // if strings.Contains(store.CityName, v.AreaName) {
result2, _ := api.JdShopAPI.GetCity(v.AreaID) // result2, _ := api.JdShopAPI.GetCity(v.AreaID)
for _, vv := range result2 { // for _, vv := range result2 {
if strings.Contains(store.DistrictName, vv.AreaName) { // if strings.Contains(store.DistrictName, vv.AreaName) {
result3, _ := api.JdShopAPI.GetCounty(vv.AreaID) // result3, _ := api.JdShopAPI.GetCounty(vv.AreaID)
for _, vvv := range result3 { // for _, vvv := range result3 {
if street == vvv.AreaName { // if street == vvv.AreaName {
createEntityStoreParam.AddCode = vvv.AreaID // createEntityStoreParam.AddCode = vvv.AreaID
break // break
} // }
} // }
} // }
} // }
} // }
} // }
} // }
} // }
} // }
vendorStoreID, _ := api.JdShop2API.CreateEntityStore(createEntityStoreParam) // vendorStoreID, _ := api.JdShop2API.CreateEntityStore(createEntityStoreParam)
// storeMap := &model.StoreMap{ // storeMap := &model.StoreMap{
// StoreID: v.StoreID, // StoreID: v.StoreID,
@@ -1726,13 +1724,31 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
// JdsStreetName: v.JdsStreetName, // JdsStreetName: v.JdsStreetName,
// } // }
// dao.WrapAddIDCULDEntity(storeMap, "jxadmin") // dao.WrapAddIDCULDEntity(storeMap, "jxadmin")
v.VendorStoreID = vendorStoreID
_, err = dao.UpdateEntity(db, v, "VendorStoreID")
if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie2", model.ConfigTypeCookie, ""); err == nil { if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie2", model.ConfigTypeCookie, ""); err == nil {
api.JdShop2API.SetCookieWithStr(configs[0].Value) api.JdShop2API.SetCookieWithStr(configs[0].Value)
} }
if shopDetailResult, err := api.JdShop2API.ShopDetail(utils.Str2Int(vendorStoreID)); err == nil { for i := 1; i < 6; i++ {
shopListResult, _ := api.JdShop2API.ShopList(i)
for _, v := range shopListResult.List {
var store *model.Store
sql := `
SELECT a.*
FROM store a
JOIN store_map b ON a.id = b.store_id
WHERE b.deleted_at = '1970-01-01 00:00:00'
AND b.vendor_id = 5
AND b.vendor_store_id = ?
AND b.vendor_org_code = 2
`
sqlParams := []interface{}{v.StoreID}
err = dao.GetRow(dao.GetDB(), &store, sql, sqlParams)
if strings.Contains(v.StoreName, "（") {
v.StoreName = v.StoreName[0:strings.Index(v.StoreName, "（")] + v.StoreName[strings.Index(v.StoreName, "）")+3:len(v.StoreName)]
}
if strings.Contains(v.StoreName, ".") {
v.StoreName = v.StoreName[0:strings.Index(v.StoreName, ".")] + v.StoreName[strings.Index(v.StoreName, ".")+1:len(v.StoreName)]
}
if shopDetailResult, err := api.JdShop2API.ShopDetail(v.StoreID); err == nil {
if store.Licence != "" { if store.Licence != "" {
data, _, _ := jxutils.DownloadFileByURL(store.Licence) data, _, _ := jxutils.DownloadFileByURL(store.Licence)
fileName := store.Licence[strings.LastIndex(store.Licence, "/")+1 : len(store.Licence)] fileName := store.Licence[strings.LastIndex(store.Licence, "/")+1 : len(store.Licence)]
@@ -1741,9 +1757,12 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
if ex == "" { if ex == "" {
ex = utils.Time2Str(utils.Str2Time(store.LicenceValid).AddDate(0, 6, 0)) ex = utils.Time2Str(utils.Str2Time(store.LicenceValid).AddDate(0, 6, 0))
} }
if !strings.Contains(ex, "00:00:00") {
ex += " 00:00:00"
}
err = api.JdShop2API.UpdateBasic(&jdshopapi.UpdateBasicParam{ err = api.JdShop2API.UpdateBasic(&jdshopapi.UpdateBasicParam{
StoreID: utils.Str2Int(vendorStoreID), StoreID: v.StoreID,
StoreName: shopDetailResult.StoreName, StoreName: v.StoreName,
CategoryID2: 62, CategoryID2: 62,
Coordinate: shopDetailResult.Coordinate, Coordinate: shopDetailResult.Coordinate,
BussinessBeginTime: shopDetailResult.BussinessBeginTime, BussinessBeginTime: shopDetailResult.BussinessBeginTime,
@@ -1768,8 +1787,7 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
}, },
}) })
} }
time.Sleep(time.Second) }
err = api.JdShop2API.UpdateExpand(utils.Str2Int(vendorStoreID))
} }
} }
return err return err