From 8429a5a27ca646d0dc611745e2375416fa0c77ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Fri, 2 Apr 2021 11:03:01 +0800 Subject: [PATCH] aa --- business/jxcallback/orderman/order.go | 152 ------- business/jxstore/cms/sku.go | 12 +- business/jxstore/cms/sync.go | 2 +- business/jxstore/cms/sync_store_sku.go | 4 +- business/jxutils/smsmsg/smsmsg.go | 2 +- business/model/store.go | 12 +- business/partner/purchase/jdshop/callback.go | 22 +- business/partner/purchase/jdshop/jds.go | 2 +- business/partner/purchase/jdshop/key.go | 50 +-- business/partner/purchase/jdshop/order.go | 2 +- business/partner/purchase/jdshop/store.go | 4 +- business/partner/purchase/jdshop/store_sku.go | 390 +++++++++--------- conf/app.conf | 8 +- controllers/jx_order.go | 2 +- globals/api/api.go | 20 +- globals/api/apimanager/apimanager.go | 8 +- 16 files changed, 267 insertions(+), 425 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 75dce5045..d0050b298 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -10,14 +10,11 @@ import ( "git.rosy.net.cn/baseapi/platformapi/jdeclpapi" - "git.rosy.net.cn/jx-callback/business/jxstore/common" - "git.rosy.net.cn/jx-callback/business/jxutils/ddmsg" "git.rosy.net.cn/jx-callback/business/jxutils/tasksch" "git.rosy.net.cn/jx-callback/business/partner/purchase/jdshop" "git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/baseapi" - "git.rosy.net.cn/baseapi/platformapi/dingdingapi" "git.rosy.net.cn/baseapi/platformapi/jdshopapi" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler" @@ -1191,155 +1188,6 @@ func GetOrderSimpleInfo(ctx *jxcontext.Context, vendorOrderID string) (getOrderS return getOrderSimpleInfoResult, err } -func SaveJdsOrders(ctx *jxcontext.Context, orderCreatedStart, orderCreatedEnd time.Time) (err error) { - var ( - pageSize = 20 - ) - orderResult, err := jdshop.CurPurchaseHandler.GetJdsOrders(ctx, utils.Time2Str(orderCreatedStart), utils.Time2Str(orderCreatedEnd), 1, pageSize) - if err != nil { - noticeMsg := fmt.Sprintf("京东商城保存订单出错！（多半是cookie过期了）,err :[%v]", err) - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "DDC5657B43EE11E9A9FF525400E86DC0", "cookie", noticeMsg) - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "1439B3E07D3911EA881A525400E86DC0", "cookie", noticeMsg) - return err - } - orders, err := result2Orders(ctx, orderResult) - if orderResult.TotalCount > pageSize { - for pageNO := 2; pageNO < orderResult.TotalCount/pageSize+1; pageNO++ { - orderResult, _ := jdshop.CurPurchaseHandler.GetJdsOrders(ctx, utils.Time2Str(orderCreatedStart), utils.Time2Str(orderCreatedEnd), pageNO, pageSize) - orders2, _ := result2Orders(ctx, orderResult) - orders = append(orders, orders2...) - } - } - for _, order := range orders { - order.StoreID = 102919 - order.JxStoreID = 102919 - order.StoreName = "商城模板(成都发货)" - order.VendorStoreID = model.JdShopMainVendorStoreID - partner.CurOrderManager.OnOrderNew(order, model.Order2Status(order)) - globals.SugarLogger.Debugf("SaveJdsOrders， order: [%v]", utils.Format4Output(order, false)) - noticeMsg := fmt.Sprintf("京东商城新订单，订单号：[%v] ,将要发到的门店id：[%v] , 门店名：[%v]", order.VendorOrderID, order.StoreID, order.StoreName) - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "DDC5657B43EE11E9A9FF525400E86DC0", "京东商城来新订单了！", noticeMsg) - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "1439B3E07D3911EA881A525400E86DC0", "京东商城来新订单了！", noticeMsg) - } - return err -} - -func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (orders []*model.GoodsOrder, err error) { - for _, jdsOrder := range result.OrderList { - //等待付款的排除 - if jdsOrder.OrderStatus != jdshopapi.JdsOrderStatusWaittingExport && jdsOrder.OrderStatus != jdshopapi.JdsOrderStatusPause { - continue - } - //有可能是库里已经有这个订单了 - orderE, err := partner.CurOrderManager.LoadOrder(utils.Int64ToStr(jdsOrder.OrderID)+"000001", model.VendorIDJDShop) - if orderE != nil { - continue - } - orderDetail, err := api.JdShopAPI.OrderDetail(utils.Int64ToStr(jdsOrder.OrderID)) - if err != nil { - globals.SugarLogger.Debugf("jds OrderDetail error: %v", err.Error()) - continue - } - order := &model.GoodsOrder{ - VendorOrderID2: utils.Int64ToStr(jdsOrder.OrderID), - VendorOrderID: utils.Int64ToStr(jdsOrder.OrderID) + "000001", - VendorID: model.VendorIDJDShop, - BaseFreightMoney: jxutils.StandardPrice2Int(jdsOrder.Freight), - VendorStatus: utils.Int2Str(jdsOrder.OrderStatus), - VendorUserID: jdsOrder.UserPin, - BuyerComment: jdsOrder.UserRemark, - PickDeadline: utils.DefaultTimeValue, - OriginalData: string(utils.MustMarshal(jdsOrder)), - StoreName: jdsOrder.StoreName, - OrderCreatedAt: utils.Str2Time(jdsOrder.OrderCreateTime + ":00"), - ConsigneeAddress: orderDetail.ConsigneeAddress, - ConsigneeName: orderDetail.ConsigneeName, - ActualPayPrice: orderDetail.ActualPayPrice, - Status: model.OrderStatusNew, - TotalShopMoney: utils.Float64TwoInt64(math.Round(utils.Int64ToFloat64(orderDetail.ActualPayPrice) * jdshopapi.JdsPayPercentage)), - DeliveryFlag: model.OrderDeliveryFlagMaskScheduleDisabled, - DeliveryType: model.OrderDeliveryTypeStoreSelf, - StatusTime: utils.Str2Time(jdsOrder.OrderCreateTime + ":00"), - OrderSeq: 0, - VendorOrgCode: "1", - } - //获取真实手机号 - fakeMobile, err := api.JdShopAPI.PhoneSensltiveInfo(order.VendorOrderID2, orderDetail.MobileKey) - if err != nil { - globals.SugarLogger.Debugf("jds PhoneSensltiveInfo error: %v", err.Error()) - continue - } else { - order.ConsigneeMobile = jxutils.DecryptDESECB([]byte(fakeMobile), []byte(jdshopapi.JdsMobileKey)) - } - if order.TotalShopMoney < 100 { - order.TotalShopMoney = 100 - } - if order.ConsigneeAddress != "" { - lng, lat, _ := api.AutonaviAPI.GetCoordinateFromAddress(order.ConsigneeAddress, "") - order.ConsigneeLng = jxutils.StandardCoordinate2Int(lng) - order.ConsigneeLat = jxutils.StandardCoordinate2Int(lat) - } - storeList, err := common.GetStoreListByLocation(ctx, jxutils.IntCoordinate2Standard(order.ConsigneeLng), jxutils.IntCoordinate2Standard(order.ConsigneeLat), 5000, false, true, 0) - if err != nil { - globals.SugarLogger.Debugf("jds GetStoreListByLocation error: %v", err.Error()) - continue - } - order.StoreID = storeList[0].ID - order.StoreName = storeList[0].Name - storeMaps, _ := dao.GetStoresMapList(dao.GetDB(), []int{model.VendorIDJDShop}, []int{order.StoreID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "") - if len(storeMaps) > 0 { - order.VendorStoreID = storeMaps[0].VendorStoreID - } - //如果是暂停，表示是预订单 - if jdsOrder.OrderStatus == jdshopapi.JdsOrderStatusPause { - order.BusinessType = model.BusinessTypeDingshida - order.ExpectedDeliveredTime = utils.Str2Time(orderDetail.ExpectedDeliveredTime) - order.PickDeadline = order.ExpectedDeliveredTime.Add(-time.Hour) - } else if jdsOrder.OrderStatus == jdshopapi.JdsOrderStatusWaittingExport { - order.ExpectedDeliveredTime = order.OrderCreatedAt.Add(time.Hour) - order.BusinessType = model.BusinessTypeImmediate - } else { - globals.SugarLogger.Errorf("未知的京东商城订单状态！status : %v", jdsOrder.OrderStatus) - } - - //结算类型 - storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), order.StoreID, model.VendorIDJDShop, "") - if storeDetail != nil { - if storeDetail.PayPercentage < 50 { - order.EarningType = model.EarningTypePoints - } else { - order.EarningType = model.EarningTypeQuote - } - } - setJdsOrderSeq(order) - for _, v := range jdsOrder.OrderItems { - sku := &model.OrderSku{ - VendorID: model.VendorIDJDShop, - VendorOrderID: order.VendorOrderID, - Count: v.SkuNum, - VendorSkuID: utils.Int64ToStr(v.SkuID), - SkuName: v.SkuName, - VendorPrice: jxutils.StandardPrice2Int(v.JdPrice), - SalePrice: jxutils.StandardPrice2Int(v.JdPrice), - } - var storeSku *model.StoreSkuBind - sql := ` - SELECT * FROM store_sku_bind WHERE store_id = ? AND jds_id = ? AND deleted_at = ? - ` - sqlParams := []interface{}{model.JdShopMainStoreID, v.SkuID, utils.DefaultTimeValue} - err = dao.GetRow(dao.GetDB(), &storeSku, sql, sqlParams) - if storeSku != nil { - sku.SkuID = storeSku.SkuID - } - _, _, _, specUnit, _, specQuality := jxutils.SplitSkuName(v.SkuName) - sku.Weight = jxutils.FormatSkuWeight(specQuality, specUnit) - order.Skus = append(order.Skus, sku) - } - orders = append(orders, order) - } - return orders, err -} - func setJdsOrderSeq(order *model.GoodsOrder) (err error) { type tCount struct { Count int `json:"count"` diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 17b3624f6..b7e4a5d9b 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -1045,12 +1045,12 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf dao.Rollback(db, txDB) return 0, err } - if valid["jdsStockSwitch"] != nil { - if _, err = SetStoreSkuSyncStatus2(db, []int{model.JdShopMainStoreID}, []int{model.VendorIDJDShop}, skuIDs, model.SyncFlagSaleMask); err != nil { - dao.Rollback(db, txDB) - return 0, err - } - } + // if valid["jdsStockSwitch"] != nil { + // if _, err = SetStoreSkuSyncStatus2(db, []int{model.JdShopMainStoreID}, []int{model.VendorIDJDShop}, skuIDs, model.SyncFlagSaleMask); err != nil { + // dao.Rollback(db, txDB) + // return 0, err + // } + // } } dao.Commit(db, txDB) diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go index e2f433052..0fbada587 100644 --- a/business/jxstore/cms/sync.go +++ b/business/jxstore/cms/sync.go @@ -1168,7 +1168,7 @@ func SyncJdsStoreStock(ctx *jxcontext.Context, isAsync, isContinueWhenError bool storeMaps []*model.StoreMap ) sql := ` - SELECT * FROM store_map WHERE vendor_id = ? AND vendor_store_id <> '' AND store_id <> ? AND vendor_org_code = 1 + SELECT * FROM store_map WHERE vendor_id = ? AND vendor_store_id <> '' AND store_id <> ? AND vendor_org_code = 2 ` sqlParams := []interface{}{ model.VendorIDJDShop, model.JdShopMainStoreID, diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index ae3b20269..84e1d8b6a 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -72,7 +72,7 @@ func SyncStoreCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendo num := 0 db := dao.GetDB() if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie2", model.ConfigTypeCookie, ""); err == nil { - api.JdShop2API.SetCookieWithStr(configs[0].Value) + api.JdShopAPI.SetCookieWithStr(configs[0].Value) } rootTask := tasksch.NewSeqTask(fmt.Sprintf("%s SyncStoreCategory step1", model.VendorChineseNames[vendorID]), ctx, func(rootTask *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { @@ -935,7 +935,7 @@ func amendAndPruneStoreStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, v for _, v := range localSkuList { vendorSkuID := v.VendorSkuID if vendorID == model.VendorIDJDShop { - if storeSkus, _ := dao.GetStoresSkusInfo(db, []int{model.JdShopMainStoreID2}, []int{v.SkuID}); len(storeSkus) > 0 { + if storeSkus, _ := dao.GetStoresSkusInfo(db, []int{model.JdShopMainStoreID}, []int{v.SkuID}); len(storeSkus) > 0 { vendorSkuID = utils.Int64ToStr(storeSkus[0].JdsID) } } diff --git a/business/jxutils/smsmsg/smsmsg.go b/business/jxutils/smsmsg/smsmsg.go index 434542fd7..1659a61e5 100644 --- a/business/jxutils/smsmsg/smsmsg.go +++ b/business/jxutils/smsmsg/smsmsg.go @@ -109,7 +109,7 @@ func isPushSMS(order *model.GoodsOrder) bool { stores, _ := dao.GetStoresMapList(dao.GetDB(), []int{order.VendorID}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "") if len(stores) > 0 { if stores[0].IsOrder == model.NO { - if storeID == model.MatterStoreID || storeID == model.JdShopMainStoreID || storeID == model.JdShopMainStoreID2 { + if storeID == model.MatterStoreID || storeID == model.JdShopMainStoreID { return false } else { return true diff --git a/business/model/store.go b/business/model/store.go index 20a7aab94..2fe4c72e5 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -62,12 +62,12 @@ const ( ) const ( - ExdStoreName = "饿鲜达" - MatterStoreID = 666666 - JdShopMainVendorStoreID = "999999" - JdShopMainVendorStoreID2 = "9999999" - JdShopMainStoreID = 102919 - JdShopMainStoreID2 = 100000 + ExdStoreName = "饿鲜达" + MatterStoreID = 666666 + JdShopMainVendorStoreID = "9999999" + // JdShopMainVendorStoreID2 = "9999999" + JdShopMainStoreID = 100000 + // JdShopMainStoreID2 = 100000 VendorStoreTel = "18011597879" ) diff --git a/business/partner/purchase/jdshop/callback.go b/business/partner/purchase/jdshop/callback.go index 7c753dada..ad084a1dc 100644 --- a/business/partner/purchase/jdshop/callback.go +++ b/business/partner/purchase/jdshop/callback.go @@ -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 } diff --git a/business/partner/purchase/jdshop/jds.go b/business/partner/purchase/jdshop/jds.go index 84ed0f729..904a6c89b 100644 --- a/business/partner/purchase/jdshop/jds.go +++ b/business/partner/purchase/jdshop/jds.go @@ -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, diff --git a/business/partner/purchase/jdshop/key.go b/business/partner/purchase/jdshop/key.go index 3c6197512..b192fcf79 100644 --- a/business/partner/purchase/jdshop/key.go +++ b/business/partner/purchase/jdshop/key.go @@ -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 } diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go index 0052be6f0..6cd278e70 100644 --- a/business/partner/purchase/jdshop/order.go +++ b/business/partner/purchase/jdshop/order.go @@ -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) diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go index b031588bf..22c79518d 100644 --- a/business/partner/purchase/jdshop/store.go +++ b/business/partner/purchase/jdshop/store.go @@ -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" diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go index ede47a1e6..c48a9efd9 100644 --- a/business/partner/purchase/jdshop/store_sku.go +++ b/business/partner/purchase/jdshop/store_sku.go @@ -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 diff --git a/conf/app.conf b/conf/app.conf index 17bce6a00..945183ca4 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -220,10 +220,10 @@ jdEclpAccessToken = "161eff890f2f4fbda942447f85843377wzmo" jdEclpAppKey = "0D397F05CF11C51BCDCC81744680EBC3" jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933" -jdShopAccessToken = "de8157b447584885910f429011e49cb93yjq" -jdShopAppKey = "E1D746D42474D5F1F1A10CECE75D99F6" -jdShopAppSecret = "efa7e1d1a22640fa990e6cf164b28608" -jdsCookie = "shshshfpa=13b38d4a-8ba0-df12-0012-82d9a37fb835-1573795914; shshshfpb=abYp8Dq5JobRtp2pkZa7MbA%3D%3D; __jdu=1142616513; pinId=WMIzMhF5BfL6nJp9AcA2-A; pin=shop_jxcs; unick=shop_jxcs; _tp=7FBEvLyPe%2FKcgxsfY5lRgA%3D%3D; _pst=shop_jxcs; areaId=22; ipLoc-djd=22-1930-50948-57092; user-key=3ec204b4-f204-4320-98e3-b2569c757800; cn=0; shshshfp=5d23828ee6ea3a33e1a58588db1713f8; 3AB9D23F7A4B3C9B=AK36FFYF5J6WMPRH7YTXMEX4CATHR6NAA3IQEESU2I33FEJRQ3DRLU4SZJYD2XGFLCFW43DHYP5HQKOMR4EFQSLKLA; navigation=[%22shop_jxcs%22]; __jdv=122270672|baidu|-|organic|not set|1589514011252; language=zh_CN; ceshi3.com=000; csrf_token=b84d0a5c-6288-4db4-84e1-cadf66be3bf7; mba_muid=1142616513; TrackID=1qvZk-6QSAOp1NmaouJGEx58_cFglCFv57HEfoHOezMrOnV3_FSK-5ExeYhHx97IltBADG3dvJqLIt3P57wyUW4Z2Q3Y8ITo8Cfdmlz3kykM; RT="z=1&dm=jd.com&si=mcot45862q&ss=kaf1rcqz&sl=2&tt=38t&ld=22qx&nu=b99e5a7f32b36f184614d34a1d926a39&cl=3clu&ul=3crs&hd=3cz3"; b-sec=S2JWP6CAFP7K4I6PXVBUVCO6YVXUX2JAPDHLX5RZUDE4YKCGOEXJIINB3Q4THCFCMVWZPFAYGLWLG; thor=80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0AB6BF053A5325612EC0407791BB05F5301356E71E8B282C40C06D0B5DF3439DEECB102A78FAFF7AC0FC4E2D1FA8DD8BBAE1A011E50B5C74F1870AD982D7BF453F470F31F2241B73AC4C25485025C2ABEBC8A538AF7257824D2FAEE300A1435175B0B451FB5C19B78D729FC83152CA3BAF; _vender_=TNK3O6PALVQGGA33SGBIUTOKL4OOE6DP6OMNVIPMAMULGTRFWUMTVWGFRUTYP4L4EPN3KP73P33BOBN5SNJFBNQB5OMQYSJ5MORGQLJS7QAPOMIN7AZD6B3ZLP2DV4JCXDI5P3KOXJ3PHLIIRZ2YVS4JSSA3JRSBACNLJSC24ELO46GIMRW53XGW36EBPLZMZP2MQCAMJNO44FKT46B7VDVT7KQTELESOOF6E377AYC3NWKQF6ICIYBW4BA4JL5QG2NHGNOHOUJDNUW3N22UF32DLFLEIQGVO2W55J6AKPPBT227XA5NO4S3NFVIUUUADGOYH56T72MTNXCILWVMN4RMUNVFMGL4ISGXJS7YILE7A2ESPAU43MISAOZM2BR53MGRB5OZSQZPV5DBDCN2OVVT3XT5N2VMFELARQNTMAJCDBGXFURSN2Q7SYULLKZEZHTYWWOI65LS5OIHLUZQKWFGMNSQF2UBSYV7FG46CWJGMVHOGV3FY4RUEVJK6BQ223QK3H3VMTHXCZOZV4GKR5EWGIZZDVUAK4B36BPA5HPBO7PXKBOEXEBX77IYBNQLCGMK72J4VKNOUPYKNB5JE5D5UN3R2MMFGLJARTL2QTC5ZRZ4PJCJZWWOV37VWLWFVAN5IGHPAYME73KTNFABM5W73XLOXJFQWTFRZEK3FCL3BLRV4UOXLBQGA34R4WUBYSZURMKTXXB7U; __jda=65775340.1142616513.1573036516.1589946171.1589952725.54; __jdb=65775340.147.1142616513|54.1589952725; __jdc=65775340; _base_=YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2DC7JQLRXRUO5PW6B77O6UXAZ4TCNE6YVKRXISVLBYGYO44RCDDPWDA4AEL7ZLXI2SG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4SMNBHRJCTDFHU6SZXCZD6RFXX2OORYGL5H2GYF2IIH2KKD4T72IR4F577G2E5II2OMMXYF2GDYNTS7WGAUXFEWRJ3CTKDBDWMHUKJQF4ZFOTNBBYBIZRXZYERXXIG6ATJFKID7XOR3NQ2CL6K7A2IEZV5HCBNYDPXFCM2ZMCS474KZ44S5F; _vender_new_=GI63BGTJFDBQ46CD7JXUX3HEPM4P5LEA3TJTFGW4ZGGIVOLTPK5T25EXTBLCENPUTR7E2I23YDFQ4ARO6JW3NHSWBDE73RTUKJTADIPFPLYFE3ARGJUBPHWUIONS72KRQOZC5P7PB4VPPLRHGEP7L3Z5K62L2E2MGTWHFJRQ3CAVBDYVW2Z4J6U73HW4BKKOCDAH5T6OJJKWKLBZFOTI7342QSL7YQ2E3I4T777RNZF23XGOTCP3D4INHNO5MNKT3XJZQBVHWUVZYQUXCK5QQTKWADKQUCYV3JRY6YAYOD7Z5IIKGNLREQTCPO7SYGSIS655JUGOUILFLXVZE6KCFG7ZTPRUD6VPE4KCIE4OUZSED6FTSEZHTM363E7XXCHB4NA7VLZHCQSBHDVGMRA7RM4RGJC3MOI4TJNGCLW6QKUCCZAY7XTGOTMC53TFUYERGNIH2RBULZ7UTZH5GU3TC6RWFI2QL4QTAIARA6GNVXENEOYIPZEHN222YDAJX5OBBEECAMAPNKZ3XNF5CNGDJ3DSU2ZLOCAKLFPCYTIIWPPJMCQ636F5464HS4OVFPFNIDW4OCE23JRPYP5FAL6TKHPAC3H3ZRU7WA5GKJJKBZUGIX7NEO4LZB7FJ3RZZZH3UHPQMNILD5DT2V7HVCUOVNOFBEOW5ID2ZMQ3XV264IU4MYHN64RA; _BELONG_CLIENT_=WPSC4XJXWK5USS4JNZY2X7VRLR5MCBKRSVHEXABGTHDGISIQK5YOLZUXYE7IOIM7MOKO74H6CRN6WHAAR4TMDV3XZWMXZRCRT5XRNE3V356BTOB2Y7LPK66VWQK6HPTGWVXIDXDCPVE3W5WMHAIO6AT2LX2XXVNUCXR34ZWFK6HY45CORGIKOSYDYZBF27WOKTUX6BS4FZMIJWNUX6CB4JAA25ZLF7ZEKYOO4QV5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BMTUJZACIBHXQFAVLRF76VQY5PNJGGJNBEZHSFYYJA3YORRT7FB5AHCOIFQKF3W5RWNUX6CB4JAA26JNMO7AYWNUPZF5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BWZDKMOJ5BS6II53ERY6ALV3ZWPF42L4CPUHEGPYIII35KDC4FCNVCORCXFD6IVNLBEDPB2GGP4UHWNRUDOQBDIW7RZJXBA2WV5ANZOTEGUCDWYRVQS2YUTIZNZ276PRYG4N56V6YTII7MBKBC7LYHO7C555HTSBXGNRM3E466AYN67DHWVM5HQFJ4NFDO5BTOKMOS5L2CXFVYDR2FCOILVYPEI; _lvtc_=5ZH3OJ7CWYNVGEKDRC32XTFXGY" +# jdShopAccessToken = "de8157b447584885910f429011e49cb93yjq" +# jdShopAppKey = "E1D746D42474D5F1F1A10CECE75D99F6" +# jdShopAppSecret = "efa7e1d1a22640fa990e6cf164b28608" +# jdsCookie = "shshshfpa=13b38d4a-8ba0-df12-0012-82d9a37fb835-1573795914; shshshfpb=abYp8Dq5JobRtp2pkZa7MbA%3D%3D; __jdu=1142616513; pinId=WMIzMhF5BfL6nJp9AcA2-A; pin=shop_jxcs; unick=shop_jxcs; _tp=7FBEvLyPe%2FKcgxsfY5lRgA%3D%3D; _pst=shop_jxcs; areaId=22; ipLoc-djd=22-1930-50948-57092; user-key=3ec204b4-f204-4320-98e3-b2569c757800; cn=0; shshshfp=5d23828ee6ea3a33e1a58588db1713f8; 3AB9D23F7A4B3C9B=AK36FFYF5J6WMPRH7YTXMEX4CATHR6NAA3IQEESU2I33FEJRQ3DRLU4SZJYD2XGFLCFW43DHYP5HQKOMR4EFQSLKLA; navigation=[%22shop_jxcs%22]; __jdv=122270672|baidu|-|organic|not set|1589514011252; language=zh_CN; ceshi3.com=000; csrf_token=b84d0a5c-6288-4db4-84e1-cadf66be3bf7; mba_muid=1142616513; TrackID=1qvZk-6QSAOp1NmaouJGEx58_cFglCFv57HEfoHOezMrOnV3_FSK-5ExeYhHx97IltBADG3dvJqLIt3P57wyUW4Z2Q3Y8ITo8Cfdmlz3kykM; RT="z=1&dm=jd.com&si=mcot45862q&ss=kaf1rcqz&sl=2&tt=38t&ld=22qx&nu=b99e5a7f32b36f184614d34a1d926a39&cl=3clu&ul=3crs&hd=3cz3"; b-sec=S2JWP6CAFP7K4I6PXVBUVCO6YVXUX2JAPDHLX5RZUDE4YKCGOEXJIINB3Q4THCFCMVWZPFAYGLWLG; thor=80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0AB6BF053A5325612EC0407791BB05F5301356E71E8B282C40C06D0B5DF3439DEECB102A78FAFF7AC0FC4E2D1FA8DD8BBAE1A011E50B5C74F1870AD982D7BF453F470F31F2241B73AC4C25485025C2ABEBC8A538AF7257824D2FAEE300A1435175B0B451FB5C19B78D729FC83152CA3BAF; _vender_=TNK3O6PALVQGGA33SGBIUTOKL4OOE6DP6OMNVIPMAMULGTRFWUMTVWGFRUTYP4L4EPN3KP73P33BOBN5SNJFBNQB5OMQYSJ5MORGQLJS7QAPOMIN7AZD6B3ZLP2DV4JCXDI5P3KOXJ3PHLIIRZ2YVS4JSSA3JRSBACNLJSC24ELO46GIMRW53XGW36EBPLZMZP2MQCAMJNO44FKT46B7VDVT7KQTELESOOF6E377AYC3NWKQF6ICIYBW4BA4JL5QG2NHGNOHOUJDNUW3N22UF32DLFLEIQGVO2W55J6AKPPBT227XA5NO4S3NFVIUUUADGOYH56T72MTNXCILWVMN4RMUNVFMGL4ISGXJS7YILE7A2ESPAU43MISAOZM2BR53MGRB5OZSQZPV5DBDCN2OVVT3XT5N2VMFELARQNTMAJCDBGXFURSN2Q7SYULLKZEZHTYWWOI65LS5OIHLUZQKWFGMNSQF2UBSYV7FG46CWJGMVHOGV3FY4RUEVJK6BQ223QK3H3VMTHXCZOZV4GKR5EWGIZZDVUAK4B36BPA5HPBO7PXKBOEXEBX77IYBNQLCGMK72J4VKNOUPYKNB5JE5D5UN3R2MMFGLJARTL2QTC5ZRZ4PJCJZWWOV37VWLWFVAN5IGHPAYME73KTNFABM5W73XLOXJFQWTFRZEK3FCL3BLRV4UOXLBQGA34R4WUBYSZURMKTXXB7U; __jda=65775340.1142616513.1573036516.1589946171.1589952725.54; __jdb=65775340.147.1142616513|54.1589952725; __jdc=65775340; _base_=YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2DC7JQLRXRUO5PW6B77O6UXAZ4TCNE6YVKRXISVLBYGYO44RCDDPWDA4AEL7ZLXI2SG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4SMNBHRJCTDFHU6SZXCZD6RFXX2OORYGL5H2GYF2IIH2KKD4T72IR4F577G2E5II2OMMXYF2GDYNTS7WGAUXFEWRJ3CTKDBDWMHUKJQF4ZFOTNBBYBIZRXZYERXXIG6ATJFKID7XOR3NQ2CL6K7A2IEZV5HCBNYDPXFCM2ZMCS474KZ44S5F; _vender_new_=GI63BGTJFDBQ46CD7JXUX3HEPM4P5LEA3TJTFGW4ZGGIVOLTPK5T25EXTBLCENPUTR7E2I23YDFQ4ARO6JW3NHSWBDE73RTUKJTADIPFPLYFE3ARGJUBPHWUIONS72KRQOZC5P7PB4VPPLRHGEP7L3Z5K62L2E2MGTWHFJRQ3CAVBDYVW2Z4J6U73HW4BKKOCDAH5T6OJJKWKLBZFOTI7342QSL7YQ2E3I4T777RNZF23XGOTCP3D4INHNO5MNKT3XJZQBVHWUVZYQUXCK5QQTKWADKQUCYV3JRY6YAYOD7Z5IIKGNLREQTCPO7SYGSIS655JUGOUILFLXVZE6KCFG7ZTPRUD6VPE4KCIE4OUZSED6FTSEZHTM363E7XXCHB4NA7VLZHCQSBHDVGMRA7RM4RGJC3MOI4TJNGCLW6QKUCCZAY7XTGOTMC53TFUYERGNIH2RBULZ7UTZH5GU3TC6RWFI2QL4QTAIARA6GNVXENEOYIPZEHN222YDAJX5OBBEECAMAPNKZ3XNF5CNGDJ3DSU2ZLOCAKLFPCYTIIWPPJMCQ636F5464HS4OVFPFNIDW4OCE23JRPYP5FAL6TKHPAC3H3ZRU7WA5GKJJKBZUGIX7NEO4LZB7FJ3RZZZH3UHPQMNILD5DT2V7HVCUOVNOFBEOW5ID2ZMQ3XV264IU4MYHN64RA; _BELONG_CLIENT_=WPSC4XJXWK5USS4JNZY2X7VRLR5MCBKRSVHEXABGTHDGISIQK5YOLZUXYE7IOIM7MOKO74H6CRN6WHAAR4TMDV3XZWMXZRCRT5XRNE3V356BTOB2Y7LPK66VWQK6HPTGWVXIDXDCPVE3W5WMHAIO6AT2LX2XXVNUCXR34ZWFK6HY45CORGIKOSYDYZBF27WOKTUX6BS4FZMIJWNUX6CB4JAA25ZLF7ZEKYOO4QV5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BMTUJZACIBHXQFAVLRF76VQY5PNJGGJNBEZHSFYYJA3YORRT7FB5AHCOIFQKF3W5RWNUX6CB4JAA26JNMO7AYWNUPZF5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BWZDKMOJ5BS6II53ERY6ALV3ZWPF42L4CPUHEGPYIII35KDC4FCNVCORCXFD6IVNLBEDPB2GGP4UHWNRUDOQBDIW7RZJXBA2WV5ANZOTEGUCDWYRVQS2YUTIZNZ276PRYG4N56V6YTII7MBKBC7LYHO7C555HTSBXGNRM3E466AYN67DHWVM5HQFJ4NFDO5BTOKMOS5L2CXFVYDR2FCOILVYPEI; _lvtc_=5ZH3OJ7CWYNVGEKDRC32XTFXGY" jdShopAccessToken2 = "9ad9cf5fc8b140b19a1dbbb700b47676kown" jdShopAppKey2 = "D5E8352BE0786ED16F77B4548F62F09A" diff --git a/controllers/jx_order.go b/controllers/jx_order.go index ec9f8dd81..177cf026c 100644 --- a/controllers/jx_order.go +++ b/controllers/jx_order.go @@ -1120,7 +1120,7 @@ func (c *OrderController) SendJdwlForJdsOrder() { // @router /SaveJdsOrders [post] func (c *OrderController) SaveJdsOrders() { c.callSaveJdsOrders(func(params *tOrderSaveJdsOrdersParams) (retVal interface{}, errCode string, err error) { - err = orderman.SaveJdsOrders(params.Ctx, utils.Str2Time(params.FromTime), utils.Str2Time(params.ToTime)) + // err = orderman.SaveJdsOrders(params.Ctx, utils.Str2Time(params.FromTime), utils.Str2Time(params.ToTime)) return retVal, "", err }) } diff --git a/globals/api/api.go b/globals/api/api.go index 028eca2f6..7fe1c4eba 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -49,14 +49,14 @@ var ( JdAPI *jdapi.API JdPageAPI *jdapi.API - Jd2API *jdapi.API - Jd3API *jdapi.API - JdcsAPI *jdapi.API - JdydAPI *jdapi.API - FakeJdAPI *jdapi.API - JdEclpAPI *jdeclpapi.API - JdShopAPI *jdshopapi.API - JdShop2API *jdshopapi.API + Jd2API *jdapi.API + Jd3API *jdapi.API + JdcsAPI *jdapi.API + JdydAPI *jdapi.API + FakeJdAPI *jdapi.API + JdEclpAPI *jdeclpapi.API + JdShopAPI *jdshopapi.API + // JdShop2API *jdshopapi.API ElmAPI *elmapi.API EbaiAPI *ebaiapi.API @@ -153,8 +153,8 @@ func Init() { JdEclpAPI = nil } if !beego.AppConfig.DefaultBool("disableJdShop", false) { - JdShopAPI = jdshopapi.New(beego.AppConfig.DefaultString("jdShopAccessToken", ""), beego.AppConfig.DefaultString("jdShopAppKey", ""), beego.AppConfig.DefaultString("jdShopAppSecret", "")) - JdShop2API = jdshopapi.New(beego.AppConfig.DefaultString("jdShopAccessToken2", ""), beego.AppConfig.DefaultString("jdShopAppKey2", ""), beego.AppConfig.DefaultString("jdShopAppSecret2", "")) + // JdShopAPI = jdshopapi.New(beego.AppConfig.DefaultString("jdShopAccessToken", ""), beego.AppConfig.DefaultString("jdShopAppKey", ""), beego.AppConfig.DefaultString("jdShopAppSecret", "")) + JdShopAPI = jdshopapi.New(beego.AppConfig.DefaultString("jdShopAccessToken2", ""), beego.AppConfig.DefaultString("jdShopAppKey2", ""), beego.AppConfig.DefaultString("jdShopAppSecret2", "")) } else { JdShopAPI = nil } diff --git a/globals/api/apimanager/apimanager.go b/globals/api/apimanager/apimanager.go index 4780fbba5..4b82a03d3 100644 --- a/globals/api/apimanager/apimanager.go +++ b/globals/api/apimanager/apimanager.go @@ -61,11 +61,7 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{}) case model.VendorIDEBAI: pfAPI = api.EbaiAPI case model.VendorIDJDShop: - if appOrgCode == "1" { - pfAPI = api.JdShopAPI - } else { - pfAPI = api.JdShop2API - } + pfAPI = api.JdShopAPI } return pfAPI } @@ -83,7 +79,7 @@ func (a *APIManager) GetAppOrgCodeList(vendorID int) (appOrgCodeList []string) { case model.VendorIDEBAI: appOrgCodeList = []string{api.EbaiAPI.GetSource()} case model.VendorIDJDShop: - appOrgCodeList = []string{"1", "2"} + appOrgCodeList = []string{"2"} } return appOrgCodeList }