This commit is contained in:
苏尹岚
2020-11-19 13:37:28 +08:00
parent ce7e2f619d
commit e58b124056

View File

@@ -1653,7 +1653,7 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
db = dao.GetDB() db = dao.GetDB()
) )
sql := ` sql := `
SELECT * FROM store_map WHERE vendor_id = 5 and store_id <> 102919 and deleted_at = '1970-01-01 00:00:00' AND vendor_org_code = 1 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 {
@@ -1710,23 +1710,24 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
} }
vendorStoreID, _ := api.JdShop2API.CreateEntityStore(createEntityStoreParam) vendorStoreID, _ := api.JdShop2API.CreateEntityStore(createEntityStoreParam)
storeMap := &model.StoreMap{ // storeMap := &model.StoreMap{
StoreID: v.StoreID, // StoreID: v.StoreID,
VendorStoreID: vendorStoreID, // VendorStoreID: vendorStoreID,
VendorID: model.VendorIDJDShop, // VendorID: model.VendorIDJDShop,
Status: 1, // Status: 1,
PricePercentage: 100, // PricePercentage: 100,
AutoPickup: 1, // AutoPickup: 1,
DeliveryType: 2, // DeliveryType: 2,
DeliveryCompetition: 1, // DeliveryCompetition: 1,
IsSync: 1, // IsSync: 1,
PricePercentagePack: "京西100-100", // PricePercentagePack: "京西100-100",
VendorOrgCode: "2", // VendorOrgCode: "2",
JdsStreetCode: v.JdsStreetCode, // JdsStreetCode: v.JdsStreetCode,
JdsStreetName: v.JdsStreetName, // JdsStreetName: v.JdsStreetName,
} // }
dao.WrapAddIDCULDEntity(storeMap, "jxadmin") // dao.WrapAddIDCULDEntity(storeMap, "jxadmin")
err = dao.CreateEntity(db, storeMap) 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)