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

aa

Browse Source
This commit is contained in:
苏尹岚
2021-04-02 11:03:01 +08:00
parent 0a92b20480
commit 8429a5a27c
16 changed files with 267 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
business/partner/purchase/jdshop/callback.go
View File

@@ -319,17 +319,17 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
}
func buildOrderTo102919(order *model.GoodsOrder) {
if order.VendorOrgCode == "1" {
order.StoreID = 102919
order.JxStoreID = 102919
order.StoreName = "商城模板(成都发货)"
order.VendorStoreID = model.JdShopMainVendorStoreID
} else {
order.StoreID = model.JdShopMainStoreID2
order.JxStoreID = model.JdShopMainStoreID2
order.StoreName = "商城模板店2"
order.VendorStoreID = model.JdShopMainVendorStoreID2
}
// if order.VendorOrgCode == "1" {
// order.StoreID = 102919
// order.JxStoreID = 102919
// order.StoreName = "商城模板(成都发货)"
// order.VendorStoreID = model.JdShopMainVendorStoreID
// } else {
order.StoreID = model.JdShopMainStoreID
order.JxStoreID = model.JdShopMainStoreID
order.StoreName = "商城模板店2"
order.VendorStoreID = model.JdShopMainVendorStoreID
// }
order.DeliveryFlag = model.OrderDeliveryFlagMaskScheduleDisabled
}

2
business/partner/purchase/jdshop/jds.go
View File

@@ -66,7 +66,7 @@ func (p *PurchaseHandler) UploadImg(ctx *jxcontext.Context, vendorOrgCode, imgUR
}
func (p *PurchaseHandler) GetVendorCategories(ctx *jxcontext.Context) (vendorCats []*model.SkuVendorCategory, err error) {
result, err := api.JdShop2API.FindVendorCategories()
result, err := api.JdShopAPI.FindVendorCategories()
for _, v := range result {
cat := &model.SkuVendorCategory{
VendorID: model.VendorIDJDShop,

50
business/partner/purchase/jdshop/key.go
View File

@@ -11,8 +11,8 @@ import (
)
var (
KeyList []*Key
KeyList2 []*Key
KeyList []*Key
// KeyList2 []*Key
)
type Key struct {
@@ -37,35 +37,35 @@ func InitKey() {
err = json.Unmarshal(data, &vv)
KeyList = append(KeyList, vv)
}
keyResult2, err := api.JdShop2API.KeyGet()
if err != nil {
return
}
for _, v := range keyResult2.Response.ServiceKeyList[0].Keys {
data, _ := json.Marshal(v)
vv := &Key{}
err = json.Unmarshal(data, &vv)
KeyList2 = append(KeyList2, vv)
}
// keyResult2, err := api.JdShop2API.KeyGet()
// if err != nil {
// return
// }
// for _, v := range keyResult2.Response.ServiceKeyList[0].Keys {
// data, _ := json.Marshal(v)
// vv := &Key{}
// err = json.Unmarshal(data, &vv)
// KeyList2 = append(KeyList2, vv)
// }
globals.SugarLogger.Debugf("jdshop key refreshed..")
}
func GetKey(keySign, vendorOrgCode string) (key string) {
if vendorOrgCode == "1" {
for _, v := range KeyList {
data, _ := base64.StdEncoding.DecodeString(v.ID)
if keySign == hex.EncodeToString(data) {
return v.KeyString
}
}
} else {
for _, v := range KeyList2 {
data, _ := base64.StdEncoding.DecodeString(v.ID)
if keySign == hex.EncodeToString(data) {
return v.KeyString
}
// if vendorOrgCode == "1" {
for _, v := range KeyList {
data, _ := base64.StdEncoding.DecodeString(v.ID)
if keySign == hex.EncodeToString(data) {
return v.KeyString
}
}
// } else {
// for _, v := range KeyList2 {
// data, _ := base64.StdEncoding.DecodeString(v.ID)
// if keySign == hex.EncodeToString(data) {
// return v.KeyString
// }
// }
// }
globals.SugarLogger.Debugf("no key can equal..")
return key
}

2
business/partner/purchase/jdshop/order.go
View File

@@ -74,7 +74,7 @@ func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
if status == model.OrderStatusCanceled {
err = ChangeOrderStatus(order.VendorOrderID, model.OrderStatusCanceled, "订单在京东商城已被取消！")
} else {
if jxutils.GetSaleStoreIDFromOrder(order) != model.JdShopMainStoreID && jxutils.GetSaleStoreIDFromOrder(order) != model.JdShopMainStoreID2 {
if jxutils.GetSaleStoreIDFromOrder(order) != model.JdShopMainStoreID {
err = ChangeOrderStatus(order.VendorOrderID, model.OrderStatusFinishedPickup, "自动拣货完成")
if status == model.OrderStatusAccepted {
err = p.OrderExport(jxcontext.AdminCtx, order.VendorOrderID, order.VendorOrderID, true)

4
business/partner/purchase/jdshop/store.go
View File

@@ -154,11 +154,11 @@ func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
if storeDetail.IDCardFront != "" {
data2, _, _ := jxutils.DownloadFileByURL(storeDetail.IDCardFront)
fileName := storeDetail.IDCardFront[strings.LastIndex(storeDetail.IDCardFront, "/")+1 : len(storeDetail.IDCardFront)]
url3, _ = api.JdShop2API.UploadImageNew(data2, fileName)
url3, _ = api.JdShopAPI.UploadImageNew(data2, fileName)
} else {
data2, _, _ := jxutils.DownloadFileByURL("http://image.jxc4.com/image/a9bfc170a950ab9a4c76bd10b48b222b.tem.jpg")
fileName := "a9bfc170a950ab9a4c76bd10b48b222b.tem.jpg"
url3, _ = api.JdShop2API.UploadImageNew(data2, fileName)
url3, _ = api.JdShopAPI.UploadImageNew(data2, fileName)
}
if storeDetail.IDCode == "" {
idCode = "610126198012230014"

390
business/partner/purchase/jdshop/store_sku.go
View File

@@ -34,7 +34,7 @@ var (
func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
if globals.EnableJdShopWrite {
if vendorStoreID == model.JdShopMainVendorStoreID || vendorStoreID == model.JdShopMainVendorStoreID2 {
if vendorStoreID == model.JdShopMainVendorStoreID {
for _, v := range storeSkuList {
//判断京东商城上是否有这个商品了，如果有就是添加规格而不是创建商品
//如果是京东商城2，是下架的商品，弄上架
@@ -56,7 +56,7 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
break
}
}
if v.VendorOrgCode == "2" && flag2 {
if flag2 {
err = getAPI(v.VendorOrgCode).WareDoUpdate("op", utils.Int64ToStr(v.JdsWareID))
} else {
if result.TotalItem > 0 && len(result.Data) > 0 && flag {
@@ -80,74 +80,74 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
}
var wareSaveSkus []*jdshopapi.WareSaveSkus
//先把已有的规格放进去
if v.VendorOrgCode == "2" {
wareResult, _ := getAPI(v.VendorOrgCode).FindWareById(wareSaveParam.WareID)
if wareResult != nil {
for _, v := range wareResult.Images {
wareSaveParam.ImageMap.Num0000000000 = append(wareSaveParam.ImageMap.Num0000000000, &jdshopapi.CreateSkuParamImages{
ColorID: v.ColorID,
ImgURL: v.ImgURL,
ImgIndex: v.ImgIndex,
})
}
}
skus, _, _ := getAPI(v.VendorOrgCode).SearchSkuList2([]int{int(wareSaveParam.WareID)})
if len(skus) > 0 {
for _, vv := range skus {
sku := &jdshopapi.WareSaveSkus{
SkuID: vv.SkuID,
JdPrice: utils.Float64ToStr(vv.JdPrice),
StockNum: vv.StockNum,
Props: []*jdshopapi.WareSaveSkusProp{
&jdshopapi.WareSaveSkusProp{
AttrID: utils.Str2Int(vv.SaleAttrs[0].AttrID),
AttrValues: utils.Str2Int64(vv.SaleAttrs[0].AttrValues[0]),
AttrValueAlias: vv.SaleAttrs[0].AttrValueAlias[0],
},
},
OuterID: vv.OuterID,
}
wareSaveSkus = append(wareSaveSkus, sku)
}
// if v.VendorOrgCode == "2" {
wareResult, _ := getAPI(v.VendorOrgCode).FindWareById(wareSaveParam.WareID)
if wareResult != nil {
for _, v := range wareResult.Images {
wareSaveParam.ImageMap.Num0000000000 = append(wareSaveParam.ImageMap.Num0000000000, &jdshopapi.CreateSkuParamImages{
ColorID: v.ColorID,
ImgURL: v.ImgURL,
ImgIndex: v.ImgIndex,
})
}
}
skus, _, _ := getAPI(v.VendorOrgCode).SearchSkuList2([]int{int(wareSaveParam.WareID)})
if len(skus) > 0 {
for _, vv := range skus {
sku := &jdshopapi.WareSaveSkus{
SkuID: vv.SkuID,
JdPrice: utils.Float64ToStr(vv.JdPrice),
StockNum: vv.StockNum,
Props: []*jdshopapi.WareSaveSkusProp{
&jdshopapi.WareSaveSkusProp{
AttrID: utils.Str2Int(vv.SaleAttrs[0].AttrID),
AttrValues: utils.Str2Int64(vv.SaleAttrs[0].AttrValues[0]),
AttrValueAlias: vv.SaleAttrs[0].AttrValueAlias[0],
},
},
OuterID: vv.OuterID,
}
wareSaveSkus = append(wareSaveSkus, sku)
}
}
// }
for _, vv := range v.StoreSkuSyncInfoJds {
v.JdsWareID = result.Data[0].WareID
vv.JdsWareID = result.Data[0].WareID
updateSkusParam, wareSaveSku, err := buildUpdateSkusParam(v, vv, true)
_, wareSaveSku, err := buildUpdateSkusParam(v, vv, true)
wareSaveSkus = append(wareSaveSkus, wareSaveSku)
if err != nil {
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
return failedList, err
}
if v.VendorOrgCode == "1" {
vendorSkuID, err := getAPI(v.VendorOrgCode).UpdateSkus(updateSkusParam)
if strings.Contains(err.Error(), "cookie可能过期了") {
err = nil
}
if err != nil {
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
return failedList, err
}
vv.VendorSkuID = vendorSkuID
} else {
wareSaveParam.Skus = wareSaveSkus
if wareResult, err2 := getAPI(v.VendorOrgCode).WareSave(wareSaveParam); err2 == nil {
for _, vvv := range wareResult {
if vvv.OuterID == wareSaveSku.OuterID {
vv.VendorSkuID = utils.Int64ToStr(vvv.SkuID)
break
}
}
//创建商品后要上架，改价，库存，门店关注商品等
if err = getAPI(v.VendorOrgCode).WareDoUpdate("up", utils.Int64ToStr(wareSaveParam.WareID)); err == nil {
err = getAPI(v.VendorOrgCode).StoreSkuBindStore(true, []string{vv.VendorSkuID}, nil)
// if v.VendorOrgCode == "1" {
// vendorSkuID, err := getAPI(v.VendorOrgCode).UpdateSkus(updateSkusParam)
// if strings.Contains(err.Error(), "cookie可能过期了") {
// err = nil
// }
// if err != nil {
// failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
// return failedList, err
// }
// vv.VendorSkuID = vendorSkuID
// } else {
wareSaveParam.Skus = wareSaveSkus
if wareResult, err2 := getAPI(v.VendorOrgCode).WareSave(wareSaveParam); err2 == nil {
for _, vvv := range wareResult {
if vvv.OuterID == wareSaveSku.OuterID {
vv.VendorSkuID = utils.Int64ToStr(vvv.SkuID)
break
}
}
//创建商品后要上架，改价，库存，门店关注商品等
if err = getAPI(v.VendorOrgCode).WareDoUpdate("up", utils.Int64ToStr(wareSaveParam.WareID)); err == nil {
err = getAPI(v.VendorOrgCode).StoreSkuBindStore(true, []string{vv.VendorSkuID}, nil)
}
}
// }
}
} else {
createSkuParamWare, createSkuParamSkus, wareSaveParam, err := buildCreateWareParam(v)
_, _, wareSaveParam, err := buildCreateWareParam(v)
if err != nil {
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
return failedList, err
@@ -156,72 +156,72 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
wareID int64
resultAttrs = make(map[string]int64)
)
if v.VendorOrgCode == "1" {
createSkuResult, err2 := getAPI(v.VendorOrgCode).CreateWare(createSkuParamWare, createSkuParamSkus)
err = err2
if strings.Contains(err.Error(), "cookie可能过期了") {
err = nil
}
wareID = createSkuResult.WareID
// if v.VendorOrgCode == "1" {
// createSkuResult, err2 := getAPI(v.VendorOrgCode).CreateWare(createSkuParamWare, createSkuParamSkus)
// err = err2
// if strings.Contains(err.Error(), "cookie可能过期了") {
// err = nil
// }
// wareID = createSkuResult.WareID
var paramAttrs = make(map[string]*jdshopapi.CreateSkuParamSkus)
for _, vv := range createSkuParamSkus {
for _, vvv := range vv.SaleAttrs {
paramAttrs[vvv.AttrValues[0]] = vv
}
// var paramAttrs = make(map[string]*jdshopapi.CreateSkuParamSkus)
// for _, vv := range createSkuParamSkus {
// for _, vvv := range vv.SaleAttrs {
// paramAttrs[vvv.AttrValues[0]] = vv
// }
// }
// for _, vv1 := range createSkuResult.Skus {
// for _, vvv1 := range vv1.SaleAttrs {
// if paramAttrs[vvv1.AttrValues[0]] != nil {
// resultAttrs[paramAttrs[vvv1.AttrValues[0]].OuterID] = vv1.SkuID
// }
// }
// }
// for _, vv2 := range v.StoreSkuSyncInfoJds {
// vv2.JdsWareID = createSkuResult.WareID
// if resultAttrs[utils.Int2Str(vv2.SkuID)] != 0 {
// vv2.VendorSkuID = utils.Int64ToStr(resultAttrs[utils.Int2Str(vv2.SkuID)])
// }
// }
// } else {
var createSkuResult []*jdshopapi.WareSaveResult
for i := 0; i < 10; i++ {
createSkuResult, err = getAPI(v.VendorOrgCode).WareSave(wareSaveParam)
if len(createSkuResult) > 0 {
break
}
for _, vv1 := range createSkuResult.Skus {
for _, vvv1 := range vv1.SaleAttrs {
if paramAttrs[vvv1.AttrValues[0]] != nil {
resultAttrs[paramAttrs[vvv1.AttrValues[0]].OuterID] = vv1.SkuID
}
}
}
for _, vv2 := range v.StoreSkuSyncInfoJds {
vv2.JdsWareID = createSkuResult.WareID
if resultAttrs[utils.Int2Str(vv2.SkuID)] != 0 {
vv2.VendorSkuID = utils.Int64ToStr(resultAttrs[utils.Int2Str(vv2.SkuID)])
}
}
} else {
var createSkuResult []*jdshopapi.WareSaveResult
for i := 0; i < 10; i++ {
createSkuResult, err = getAPI(v.VendorOrgCode).WareSave(wareSaveParam)
if len(createSkuResult) > 0 {
break
}
time.Sleep(time.Second)
}
wareID = createSkuResult[0].WareID
time.Sleep(time.Second)
}
wareID = createSkuResult[0].WareID
var paramAttrs = make(map[string]*jdshopapi.WareSaveSkus)
for _, vv := range wareSaveParam.Skus {
for _, vvv := range vv.Props {
paramAttrs[vvv.AttrValueAlias] = vv
}
var paramAttrs = make(map[string]*jdshopapi.WareSaveSkus)
for _, vv := range wareSaveParam.Skus {
for _, vvv := range vv.Props {
paramAttrs[vvv.AttrValueAlias] = vv
}
for _, vv1 := range createSkuResult {
for _, vvv1 := range vv1.Props {
if paramAttrs[vvv1.AttrValueAlias] != nil {
resultAttrs[paramAttrs[vvv1.AttrValueAlias].OuterID] = vv1.SkuID
}
}
}
for _, vv2 := range v.StoreSkuSyncInfoJds {
vv2.JdsWareID = createSkuResult[0].WareID
if resultAttrs[utils.Int2Str(vv2.SkuID)] != 0 {
vv2.VendorSkuID = utils.Int64ToStr(resultAttrs[utils.Int2Str(vv2.SkuID)])
}
}
//创建商品后要上架，改价，库存，门店关注商品等
if err = getAPI(v.VendorOrgCode).WareDoUpdate("up", utils.Int64ToStr(wareID)); err == nil {
for _, vv2 := range v.StoreSkuSyncInfoJds {
if resultAttrs[utils.Int2Str(vv2.SkuID)] != 0 {
err = getAPI(v.VendorOrgCode).StoreSkuBindStore(true, []string{utils.Int64ToStr(resultAttrs[utils.Int2Str(vv2.SkuID)])}, nil)
}
}
for _, vv1 := range createSkuResult {
for _, vvv1 := range vv1.Props {
if paramAttrs[vvv1.AttrValueAlias] != nil {
resultAttrs[paramAttrs[vvv1.AttrValueAlias].OuterID] = vv1.SkuID
}
}
}
for _, vv2 := range v.StoreSkuSyncInfoJds {
vv2.JdsWareID = createSkuResult[0].WareID
if resultAttrs[utils.Int2Str(vv2.SkuID)] != 0 {
vv2.VendorSkuID = utils.Int64ToStr(resultAttrs[utils.Int2Str(vv2.SkuID)])
}
}
//创建商品后要上架，改价，库存，门店关注商品等
if err = getAPI(v.VendorOrgCode).WareDoUpdate("up", utils.Int64ToStr(wareID)); err == nil {
for _, vv2 := range v.StoreSkuSyncInfoJds {
if resultAttrs[utils.Int2Str(vv2.SkuID)] != 0 {
err = getAPI(v.VendorOrgCode).StoreSkuBindStore(true, []string{utils.Int64ToStr(resultAttrs[utils.Int2Str(vv2.SkuID)])}, nil)
}
}
}
// }
if err != nil {
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
return failedList, err
@@ -255,38 +255,38 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
//如果是普通店关注商品
for _, v := range storeSkuList {
for _, vv := range v.StoreSkuSyncInfoJds {
if vv.VendorOrgCode == "2" {
storeSkus, _ := dao.GetStoresSkusInfo(dao.GetDB(), []int{model.JdShopMainStoreID2}, []int{vv.SkuID})
if len(storeSkus) > 0 {
for _, storeSku := range storeSkus {
if storeSku.JdsID != 0 {
status := vv.Status
stock := vv.Stock
price := vv.VendorPrice
if status == model.StoreSkuBindStatusNormal {
err = getAPI(vv.VendorOrgCode).StoreWareDoUpdate(status, storeSku.JdsID, vendorStoreID)
if err != nil {
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
return failedList, err
}
// if vv.VendorOrgCode == "2" {
storeSkus, _ := dao.GetStoresSkusInfo(dao.GetDB(), []int{model.JdShopMainStoreID}, []int{vv.SkuID})
if len(storeSkus) > 0 {
for _, storeSku := range storeSkus {
if storeSku.JdsID != 0 {
status := vv.Status
stock := vv.Stock
price := vv.VendorPrice
if status == model.StoreSkuBindStatusNormal {
err = getAPI(vv.VendorOrgCode).StoreWareDoUpdate(status, storeSku.JdsID, vendorStoreID)
if err != nil {
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
return failedList, err
}
if stock != 0 {
err = getAPI(vv.VendorOrgCode).StoreUpdateStock(stock, storeSku.JdsID, vendorStoreID)
if err != nil {
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
return failedList, err
}
}
err = getAPI(v.VendorOrgCode).StoreUpdatePrice(utils.Float64ToStr(jxutils.IntPrice2Standard(int64(price))), storeSku.JdsID, vendorStoreID)
}
if stock != 0 {
err = getAPI(vv.VendorOrgCode).StoreUpdateStock(stock, storeSku.JdsID, vendorStoreID)
if err != nil {
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
return failedList, err
}
}
err = getAPI(v.VendorOrgCode).StoreUpdatePrice(utils.Float64ToStr(jxutils.IntPrice2Standard(int64(price))), storeSku.JdsID, vendorStoreID)
}
if err != nil {
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
return failedList, err
}
}
if err != nil {
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
return failedList, err
}
}
}
// }
}
}
}
@@ -294,7 +294,7 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
}
func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
if globals.EnableJdShopWrite && (vendorStoreID == model.JdShopMainVendorStoreID || vendorStoreID == model.JdShopMainVendorStoreID2) {
if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
if vendorStoreID == model.JdShopMainVendorStoreID {
for _, v := range storeSkuList {
name := filterSensitiveWord(v.Name)
@@ -456,7 +456,7 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
}
func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
if globals.EnableJdShopWrite && (vendorStoreID == model.JdShopMainVendorStoreID || vendorStoreID == model.JdShopMainVendorStoreID2) {
if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
for _, v := range storeSkuList {
if v.IsDeletedBySku {
err = getAPI(v.VendorOrgCode).DeleteSku(utils.Str2Int64(v.VendorSkuID))
@@ -483,9 +483,9 @@ func (p *PurchaseHandler) GetStoreSkusFullInfo(ctx *jxcontext.Context, parentTas
pageNo = 1
pageSize = 20
)
if result, totalCount, err := api.JdShop2API.StoreProductSearch(pageNo, pageSize, []string{vendorStoreID}); err == nil && result != nil {
if result, totalCount, err := api.JdShopAPI.StoreProductSearch(pageNo, pageSize, []string{vendorStoreID}); err == nil && result != nil {
for ; pageNo <= totalCount/pageSize+1; pageNo++ {
result2, _, err := api.JdShop2API.StoreProductSearch(pageNo, pageSize, []string{vendorStoreID})
result2, _, err := api.JdShopAPI.StoreProductSearch(pageNo, pageSize, []string{vendorStoreID})
if err == nil {
for _, v := range result2 {
if skuName := vendorSku2Jx2(v); skuName != nil {
@@ -522,36 +522,34 @@ func getMainStoreVendorSkuID(mainStoreID int, skuID int) (vendorSkuID int64, err
func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo, status int) (failedList []*partner.StoreSkuInfoWithErr, err error) {
if globals.EnableJdShopWrite {
var stock = 0
// var stock = 0
for _, v := range storeSkuList {
if storeID == model.JdShopMainStoreID {
if status == model.SkuStatusNormal {
stock = 9999
}
if v.JdsStockSwitch == model.NO {
stock = 0
}
err = getAPI(v.VendorOrgCode).UpdateSkuStock(utils.Str2Int(v.VendorSkuID), stock)
} else if storeID == model.JdShopMainStoreID2 {
} else {
if v.VendorOrgCode == "1" {
storeSkus, err2 := dao.GetStoresSkusInfo(dao.GetDB(), []int{model.JdShopMainStoreID}, []int{v.SkuID})
err = err2
if len(storeSkus) > 0 {
if storeSkus[0].JdsID != 0 && vendorStoreID != "" {
if storeSkus[0].Status == model.SkuStatusNormal {
stock = 9999
}
err = getAPI(v.VendorOrgCode).UpdateSkuSiteStock(storeSkus[0].JdsID, stock, utils.Str2Int(vendorStoreID))
}
}
} else {
if vendorSkuID, err := getMainStoreVendorSkuID(model.JdShopMainStoreID2, v.SkuID); err == nil && vendorSkuID != 0 {
err = getAPI(v.VendorOrgCode).StoreWareDoUpdate(status, vendorSkuID, vendorStoreID)
}
}
// if storeID == model.JdShopMainStoreID {
// if status == model.SkuStatusNormal {
// stock = 9999
// }
// if v.JdsStockSwitch == model.NO {
// stock = 0
// }
// err = getAPI(v.VendorOrgCode).UpdateSkuStock(utils.Str2Int(v.VendorSkuID), stock)
// } else {
// if v.VendorOrgCode == "1" {
// storeSkus, err2 := dao.GetStoresSkusInfo(dao.GetDB(), []int{model.JdShopMainStoreID}, []int{v.SkuID})
// err = err2
// if len(storeSkus) > 0 {
// if storeSkus[0].JdsID != 0 && vendorStoreID != "" {
// if storeSkus[0].Status == model.SkuStatusNormal {
// stock = 9999
// }
// err = getAPI(v.VendorOrgCode).UpdateSkuSiteStock(storeSkus[0].JdsID, stock, utils.Str2Int(vendorStoreID))
// }
// }
// } else {
if vendorSkuID, err := getMainStoreVendorSkuID(model.JdShopMainStoreID, v.SkuID); err == nil && vendorSkuID != 0 {
err = getAPI(v.VendorOrgCode).StoreWareDoUpdate(status, vendorSkuID, vendorStoreID)
}
// }
// }
}
if err != nil {
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "修改商品库存")
@@ -563,19 +561,19 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr
func (p *PurchaseHandler) UpdateStoreSkusPrice(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
if globals.EnableJdShopWrite {
for _, v := range storeSkuList {
if storeID == model.JdShopMainStoreID {
err = getAPI(v.VendorOrgCode).UpdateSkuJdPrice(utils.Str2Int(v.VendorSkuID), jxutils.IntPrice2Standard(v.VendorPrice))
} else if storeID == model.JdShopMainStoreID2 {
//修改京东商城商品库价格
} else {
if v.VendorOrgCode == "1" {
// null
} else {
if vendorSkuID, err := getMainStoreVendorSkuID(model.JdShopMainStoreID2, v.SkuID); err == nil && vendorSkuID != 0 {
err = getAPI(v.VendorOrgCode).StoreUpdatePrice(utils.Float64ToStr(jxutils.IntPrice2Standard(v.VendorPrice)), vendorSkuID, vendorStoreID)
}
}
// if storeID == model.JdShopMainStoreID {
// err = getAPI(v.VendorOrgCode).UpdateSkuJdPrice(utils.Str2Int(v.VendorSkuID), jxutils.IntPrice2Standard(v.VendorPrice))
// } else if storeID == model.JdShopMainStoreID2 {
// //修改京东商城商品库价格
// } else {
// if v.VendorOrgCode == "1" {
// // null
// } else {
if vendorSkuID, err := getMainStoreVendorSkuID(model.JdShopMainStoreID, v.SkuID); err == nil && vendorSkuID != 0 {
err = getAPI(v.VendorOrgCode).StoreUpdatePrice(utils.Float64ToStr(jxutils.IntPrice2Standard(v.VendorPrice)), vendorSkuID, vendorStoreID)
}
// }
// }
if err != nil {
failedList = append(failedList, putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "修改商品价格")...)
}
@@ -587,19 +585,19 @@ func (p *PurchaseHandler) UpdateStoreSkusPrice(ctx *jxcontext.Context, vendorOrg
func (p *PurchaseHandler) UpdateStoreSkusStock(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
if globals.EnableJdShopWrite {
for _, v := range storeSkuList {
if storeID == model.JdShopMainStoreID {
// if storeID == model.JdShopMainStoreID {
} else if storeID == model.JdShopMainStoreID2 {
// } else if storeID == model.JdShopMainStoreID2 {
} else {
if v.VendorOrgCode == "1" {
// } else {
// if v.VendorOrgCode == "1" {
} else {
if vendorSkuID, err := getMainStoreVendorSkuID(model.JdShopMainStoreID2, v.SkuID); err == nil && vendorSkuID != 0 {
err = getAPI(v.VendorOrgCode).StoreUpdateStock(v.Stock, vendorSkuID, vendorStoreID)
}
}
// } else {
if vendorSkuID, err := getMainStoreVendorSkuID(model.JdShopMainStoreID, v.SkuID); err == nil && vendorSkuID != 0 {
err = getAPI(v.VendorOrgCode).StoreUpdateStock(v.Stock, vendorSkuID, vendorStoreID)
}
// }
// }
}
if err != nil {
failedList = append(failedList, putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "修改商品库存")...)
@@ -626,7 +624,7 @@ func (p *PurchaseHandler) GetStoreAllCategories(ctx *jxcontext.Context, storeID
}
func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeCat *dao.SkuStoreCatInfo) (err error) {
if globals.EnableJdShopWrite && (vendorStoreID == model.JdShopMainVendorStoreID || vendorStoreID == model.JdShopMainVendorStoreID2) {
if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
status, err2 := updateOrCreateCategories(storeCat, true)
err = err2
if status == -1 {
@@ -661,7 +659,7 @@ func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID in
}
func (p *PurchaseHandler) UpdateStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeCat *dao.SkuStoreCatInfo) (err error) {
if globals.EnableJdShopWrite && (vendorStoreID == model.JdShopMainVendorStoreID || vendorStoreID == model.JdShopMainVendorStoreID2) {
if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
status, err2 := updateOrCreateCategories(storeCat, false)
err = err2
if status == -1 {
@@ -672,7 +670,7 @@ func (p *PurchaseHandler) UpdateStoreCategory(ctx *jxcontext.Context, storeID in
}
func (p *PurchaseHandler) DeleteStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID, vendorCatID string, level int) (err error) {
if globals.EnableJdShopWrite && (vendorStoreID == model.JdShopMainVendorStoreID || vendorStoreID == model.JdShopMainVendorStoreID2) {
if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
_, err = api.JdShopAPI.DeleteShopCategory(utils.Str2Int64(vendorCatID))
}
return err