This commit is contained in:
苏尹岚
2020-12-03 11:14:19 +08:00
parent 3af9c45fdb
commit f2e52b14b4

View File

@@ -14,6 +14,7 @@ import (
"github.com/qiniu/api.v7/storage" "github.com/qiniu/api.v7/storage"
"git.rosy.net.cn/baseapi/platformapi/jdapi" "git.rosy.net.cn/baseapi/platformapi/jdapi"
"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
"git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/baseapi/platformapi/mtwmapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/baseapi/utils/errlist" "git.rosy.net.cn/baseapi/utils/errlist"
@@ -1592,150 +1593,103 @@ 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 := ` if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie2", model.ConfigTypeCookie, ""); err == nil {
// 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 = '' api.JdShop2API.SetCookieWithStr(configs[0].Value)
// ` }
// err = dao.GetRows(db, &storeMaps, sql, nil) sql := `
// for _, v := range storeMaps { SELECT * from store_map where vendor_id = 5 and deleted_at = '1970-01-01 00:00:00' and vendor_org_code = 2 and store_id <> 667281
// store, _ := dao.GetStoreDetail(db, v.StoreID, model.VendorIDJDShop, "") AND store_id = 103075
// data, _, _ := jxutils.DownloadFileByURL(jdshopapi.JdsStoreImg) `
// timeMap := map[string]string{ err = dao.GetRows(db, &storeMaps, sql, nil)
// "businessBeginTime": int2TimeStr(int(store.OpenTime1)), for _, v := range storeMaps {
// "businessEndTime": int2TimeStr(int(store.CloseTime1)), store, _ := dao.GetStoreDetail(db, v.StoreID, model.VendorIDJDShop, "2")
// } err = api.JdShop2API.DeleteStoresByID(utils.Str2Int64(store.VendorStoreID))
// timeJSON, _ := json.Marshal(timeMap) data, _, _ := jxutils.DownloadFileByURL(jdshopapi.JdsStoreImg)
// createEntityStoreParam := &jdshopapi.CreateEntityStoreParam{ url, _ := api.JdShop2API.UploadImageNew(data, "2659335b16e3880e367759b8fc675933.tem.png")
// Name: "京西菜市" + strings.ReplaceAll(store.Name, "店", "") + "生鲜店", ex := store.LicenceExpire
// AddCode: store.JdsCode, if ex == "" {
// AddCodeName: store.DistrictName, ex = utils.Time2Str(utils.Str2Time(store.LicenceValid).AddDate(0, 6, 0))
// AddName: store.ProvinceName + store.CityName + store.DistrictName + "@!" + store.Address, }
// Coordinate: utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lat)) + "," + utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lng)), if !strings.Contains(ex, "00:00:00") {
// Phone: store.Tel1, ex += " 00:00:00"
// ExtendJSON: string(timeJSON), }
// ImageFile: base64.StdEncoding.EncodeToString(data), data2, _, _ := jxutils.DownloadFileByURL(store.Licence)
// CategoryName: "生鲜店", fileName := store.Licence[strings.LastIndex(store.Licence, "/")+1 : len(store.Licence)]
// CustomerID: utils.Int2Str(store.ID), url2, _ := api.JdShop2API.UploadImageNew(data2, fileName)
// } if strings.Contains(v.StoreName, "") {
// if store.JdsStreetCode != 0 { v.StoreName = v.StoreName[0:strings.Index(v.StoreName, "")] + v.StoreName[strings.Index(v.StoreName, "")+3:len(v.StoreName)]
// createEntityStoreParam.AddCode = store.JdsStreetCode }
// } if strings.Contains(v.StoreName, ".") {
// if createEntityStoreParam.AddCode == 0 { v.StoreName = v.StoreName[0:strings.Index(v.StoreName, ".")] + v.StoreName[strings.Index(v.StoreName, ".")+1:len(v.StoreName)]
// createEntityStoreParam.AddCode = store.JdCode }
// } 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 model.ZXCityCodeMap[store.CityCode] != "" { }
// result, _ := api.AutonaviAPI.GetCoordinateAreaInfo(jxutils.IntCoordinate2Standard(store.Lng), jxutils.IntCoordinate2Standard(store.Lat)) param := &jdshopapi.UpdateBasicParam{
// if result["regeocode"] != nil { StoreName: "京西菜市" + strings.ReplaceAll(v.StoreName, "店", "") + "生鲜店",
// street := result["regeocode"].(map[string]interface{})["addressComponent"].(map[string]interface{})["township"].(string) CategoryID2: 62,
// if street != "" { Coordinate: utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lat)) + "," + utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lng)),
// result1, _ := api.JdShopAPI.GetProvince() BussinessBeginTime: int2TimeStr(int(store.OpenTime1)),
// for _, v := range result1 { BussinessEndTime: int2TimeStr(int(store.CloseTime1)),
// if strings.Contains(store.CityName, v.AreaName) { ImgURL: url,
// result2, _ := api.JdShopAPI.GetCity(v.AreaID) StorePhone: store.Tel1,
// for _, vv := range result2 { AddName: store.Address,
// if strings.Contains(store.DistrictName, vv.AreaName) { AddCode3: store.JdsCode,
// result3, _ := api.JdShopAPI.GetCounty(vv.AreaID) CategoryID1: 34,
// for _, vvv := range result3 { QualificationRequests: []*jdshopapi.QualificationRequests{
// if street == vvv.AreaName { &jdshopapi.QualificationRequests{
// createEntityStoreParam.AddCode = vvv.AreaID QualificationID: 41,
// break QualificationName: "营业执照",
// } QualificationNo: store.LicenceCode,
// } QualificationURL: url2,
// } StartTime: utils.Time2Str(utils.Str2Time(store.LicenceValid)),
// } EndingTime: ex,
// } Time: []string{utils.Time2Str(utils.Str2Time(store.LicenceValid)), ex},
// } },
// } },
// } }
// } if store.JdsStreetCode != 0 {
// vendorStoreID, _ := api.JdShop2API.CreateEntityStore(createEntityStoreParam) param.AddCode3 = store.JdsStreetCode
}
// storeMap := &model.StoreMap{ if param.AddCode3 == 0 {
// StoreID: v.StoreID, param.AddCode3 = store.JdCode
// VendorStoreID: vendorStoreID, }
// VendorID: model.VendorIDJDShop, //证明这个店可能隶属直辖市或者东莞
// Status: 1, if model.ZXCityCodeMap[store.CityCode] != "" {
// PricePercentage: 100, result, _ := api.AutonaviAPI.GetCoordinateAreaInfo(jxutils.IntCoordinate2Standard(store.Lng), jxutils.IntCoordinate2Standard(store.Lat))
// AutoPickup: 1, if result["regeocode"] != nil {
// DeliveryType: 2, street := result["regeocode"].(map[string]interface{})["addressComponent"].(map[string]interface{})["township"].(string)
// DeliveryCompetition: 1, if street != "" {
// IsSync: 1, result1, _ := api.JdShopAPI.GetProvince()
// PricePercentagePack: "京西100-100", for _, v := range result1 {
// VendorOrgCode: "2", if strings.Contains(store.CityName, v.AreaName) {
// JdsStreetCode: v.JdsStreetCode, result2, _ := api.JdShopAPI.GetCity(v.AreaID)
// JdsStreetName: v.JdsStreetName, for _, vv := range result2 {
// } if strings.Contains(store.DistrictName, vv.AreaName) {
// dao.WrapAddIDCULDEntity(storeMap, "jxadmin") result3, _ := api.JdShopAPI.GetCounty(vv.AreaID)
// if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie2", model.ConfigTypeCookie, ""); err == nil { for _, vvv := range result3 {
// api.JdShop2API.SetCookieWithStr(configs[0].Value) if street == vvv.AreaName {
// } param.AddCode3 = vvv.AreaID
// for i := 1; i < 6; i++ { break
// 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 = ? if vendorStroeID, err := api.JdShop2API.SubmitBasic(param); err == nil {
// AND b.vendor_org_code = 2 v.VendorStoreID = utils.Int64ToStr(vendorStroeID)
// ` dao.UpdateEntity(db, v, "VendorStoreID")
// sqlParams := []interface{}{v.StoreID} err = api.JdShop2API.UpdateExpand(int(vendorStroeID))
// 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 != "" {
// data, _, _ := jxutils.DownloadFileByURL(store.Licence)
// fileName := store.Licence[strings.LastIndex(store.Licence, "/")+1 : len(store.Licence)]
// url, _ := api.JdShop2API.UploadImageNew(data, fileName)
// ex := store.LicenceExpire
// if ex == "" {
// 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{
// StoreID: v.StoreID,
// StoreName: v.StoreName,
// CategoryID2: 62,
// Coordinate: shopDetailResult.Coordinate,
// BussinessBeginTime: shopDetailResult.BussinessBeginTime,
// BussinessEndTime: shopDetailResult.BussinessEndTime,
// ImgURL: shopDetailResult.ImgURL,
// StorePhone: shopDetailResult.StorePhone,
// AddName: shopDetailResult.AddName,
// AddCode1: shopDetailResult.AddCode1,
// AddCode2: shopDetailResult.AddCode2,
// AddCode3: shopDetailResult.AddCode3,
// CategoryID1: 34,
// QualificationRequests: []*jdshopapi.QualificationRequests{
// &jdshopapi.QualificationRequests{
// QualificationID: 41,
// QualificationName: "营业执照",
// QualificationNo: store.LicenceCode,
// QualificationURL: url,
// StartTime: utils.Time2Str(utils.Str2Time(store.LicenceValid)),
// EndingTime: ex,
// Time: []string{utils.Time2Str(utils.Str2Time(store.LicenceValid)), ex},
// },
// },
// })
// }
// }
// }
// }
// var ( // var (
// db = dao.GetDB() // db = dao.GetDB()
// ) // )
@@ -1768,33 +1722,33 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
// } // }
// } // }
// } // }
var ( // var (
db = dao.GetDB() // db = dao.GetDB()
) // )
storeSkus, _ := dao.GetStoresSkusInfo(db, []int{model.JdShopMainStoreID2}, nil) // storeSkus, _ := dao.GetStoresSkusInfo(db, []int{model.JdShopMainStoreID2}, nil)
for _, v := range storeSkus { // for _, v := range storeSkus {
if v.JdsID != 0 { // if v.JdsID != 0 {
// if err = api.JdShop2API.StoreSkuBindStore(false, []string{utils.Int64ToStr(v.JdsID)}, []string{"1000063128"}); err == nil { // if err = api.JdShop2API.StoreSkuBindStore(false, []string{utils.Int64ToStr(v.JdsID)}, []string{"1000063128"}); err == nil {
storeSkus2, _ := dao.GetStoresSkusInfo(db, []int{667281}, []int{v.SkuID}) // storeSkus2, _ := dao.GetStoresSkusInfo(db, []int{667281}, []int{v.SkuID})
if len(storeSkus2) > 0 { // if len(storeSkus2) > 0 {
// status := storeSkus2[0].Status // status := storeSkus2[0].Status
// stock := storeSkus2[0].Stock // stock := storeSkus2[0].Stock
price := storeSkus2[0].Price // price := storeSkus2[0].Price
// if status == model.StoreSkuBindStatusNormal { // if status == model.StoreSkuBindStatusNormal {
// api.JdShop2API.StoreWareDoUpdate(status, v.JdsID, "1000063128") // api.JdShop2API.StoreWareDoUpdate(status, v.JdsID, "1000063128")
// } // }
// if stock != 0 { // if stock != 0 {
// api.JdShop2API.StoreUpdateStock(stock, v.JdsID, "1000063128") // api.JdShop2API.StoreUpdateStock(stock, v.JdsID, "1000063128")
// } // }
api.JdShop2API.StoreUpdatePrice(utils.Float64ToStr(jxutils.IntPrice2Standard(int64(price))), v.JdsID, "1000063128") // api.JdShop2API.StoreUpdatePrice(utils.Float64ToStr(jxutils.IntPrice2Standard(int64(price))), v.JdsID, "1000063128")
} else { // } else {
continue // continue
} // }
// } // }
} else { // } else {
continue // continue
} // }
} // }
return err return err
} }