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

152
business/jxcallback/orderman/order.go
View File

@@ -10,14 +10,11 @@ import (
"git.rosy.net.cn/baseapi/platformapi/jdeclpapi" "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/jxutils/tasksch"
"git.rosy.net.cn/jx-callback/business/partner/purchase/jdshop" "git.rosy.net.cn/jx-callback/business/partner/purchase/jdshop"
"git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/api"
"git.rosy.net.cn/baseapi" "git.rosy.net.cn/baseapi"
"git.rosy.net.cn/baseapi/platformapi/dingdingapi"
"git.rosy.net.cn/baseapi/platformapi/jdshopapi" "git.rosy.net.cn/baseapi/platformapi/jdshopapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler" "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler"
@@ -1191,155 +1188,6 @@ func GetOrderSimpleInfo(ctx *jxcontext.Context, vendorOrderID string) (getOrderS
return getOrderSimpleInfoResult, err 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) { func setJdsOrderSeq(order *model.GoodsOrder) (err error) {
type tCount struct { type tCount struct {
Count int `json:"count"` Count int `json:"count"`

12
business/jxstore/cms/sku.go
View File

@@ -1045,12 +1045,12 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
dao.Rollback(db, txDB) dao.Rollback(db, txDB)
return 0, err return 0, err
} }
if valid["jdsStockSwitch"] != nil { // if valid["jdsStockSwitch"] != nil {
if _, err = SetStoreSkuSyncStatus2(db, []int{model.JdShopMainStoreID}, []int{model.VendorIDJDShop}, skuIDs, model.SyncFlagSaleMask); err != nil { // if _, err = SetStoreSkuSyncStatus2(db, []int{model.JdShopMainStoreID}, []int{model.VendorIDJDShop}, skuIDs, model.SyncFlagSaleMask); err != nil {
dao.Rollback(db, txDB) // dao.Rollback(db, txDB)
return 0, err // return 0, err
} // }
} // }
} }
dao.Commit(db, txDB) dao.Commit(db, txDB)

2
business/jxstore/cms/sync.go
View File

@@ -1168,7 +1168,7 @@ func SyncJdsStoreStock(ctx *jxcontext.Context, isAsync, isContinueWhenError bool
storeMaps []*model.StoreMap storeMaps []*model.StoreMap
) )
sql := ` 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{}{ sqlParams := []interface{}{
model.VendorIDJDShop, model.JdShopMainStoreID, model.VendorIDJDShop, model.JdShopMainStoreID,

4
business/jxstore/cms/sync_store_sku.go
View File

@@ -72,7 +72,7 @@ func SyncStoreCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendo
num := 0 num := 0
db := dao.GetDB() db := dao.GetDB()
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.JdShopAPI.SetCookieWithStr(configs[0].Value)
} }
rootTask := tasksch.NewSeqTask(fmt.Sprintf("%s SyncStoreCategory step1", model.VendorChineseNames[vendorID]), ctx, rootTask := tasksch.NewSeqTask(fmt.Sprintf("%s SyncStoreCategory step1", model.VendorChineseNames[vendorID]), ctx,
func(rootTask *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { 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 { for _, v := range localSkuList {
vendorSkuID := v.VendorSkuID vendorSkuID := v.VendorSkuID
if vendorID == model.VendorIDJDShop { 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) vendorSkuID = utils.Int64ToStr(storeSkus[0].JdsID)
} }
} }

2
business/jxutils/smsmsg/smsmsg.go
View File

@@ -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, "", "", "") stores, _ := dao.GetStoresMapList(dao.GetDB(), []int{order.VendorID}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "")
if len(stores) > 0 { if len(stores) > 0 {
if stores[0].IsOrder == model.NO { 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 return false
} else { } else {
return true return true

8
business/model/store.go
View File

@@ -64,10 +64,10 @@ const (
const ( const (
ExdStoreName = "饿鲜达" ExdStoreName = "饿鲜达"
MatterStoreID = 666666 MatterStoreID = 666666
JdShopMainVendorStoreID = "999999" JdShopMainVendorStoreID = "9999999"
JdShopMainVendorStoreID2 = "9999999" // JdShopMainVendorStoreID2 = "9999999"
JdShopMainStoreID = 102919 JdShopMainStoreID = 100000
JdShopMainStoreID2 = 100000 // JdShopMainStoreID2 = 100000
VendorStoreTel = "18011597879" VendorStoreTel = "18011597879"
) )

20
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) { func buildOrderTo102919(order *model.GoodsOrder) {
if order.VendorOrgCode == "1" { // if order.VendorOrgCode == "1" {
order.StoreID = 102919 // order.StoreID = 102919
order.JxStoreID = 102919 // order.JxStoreID = 102919
order.StoreName = "商城模板(成都发货)" // order.StoreName = "商城模板(成都发货)"
order.VendorStoreID = model.JdShopMainVendorStoreID // order.VendorStoreID = model.JdShopMainVendorStoreID
} else { // } else {
order.StoreID = model.JdShopMainStoreID2 order.StoreID = model.JdShopMainStoreID
order.JxStoreID = model.JdShopMainStoreID2 order.JxStoreID = model.JdShopMainStoreID
order.StoreName = "商城模板店2" order.StoreName = "商城模板店2"
order.VendorStoreID = model.JdShopMainVendorStoreID2 order.VendorStoreID = model.JdShopMainVendorStoreID
} // }
order.DeliveryFlag = model.OrderDeliveryFlagMaskScheduleDisabled 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) { 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 { for _, v := range result {
cat := &model.SkuVendorCategory{ cat := &model.SkuVendorCategory{
VendorID: model.VendorIDJDShop, VendorID: model.VendorIDJDShop,

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

@@ -12,7 +12,7 @@ import (
var ( var (
KeyList []*Key KeyList []*Key
KeyList2 []*Key // KeyList2 []*Key
) )
type Key struct { type Key struct {
@@ -37,35 +37,35 @@ func InitKey() {
err = json.Unmarshal(data, &vv) err = json.Unmarshal(data, &vv)
KeyList = append(KeyList, vv) KeyList = append(KeyList, vv)
} }
keyResult2, err := api.JdShop2API.KeyGet() // keyResult2, err := api.JdShop2API.KeyGet()
if err != nil { // if err != nil {
return // return
} // }
for _, v := range keyResult2.Response.ServiceKeyList[0].Keys { // for _, v := range keyResult2.Response.ServiceKeyList[0].Keys {
data, _ := json.Marshal(v) // data, _ := json.Marshal(v)
vv := &Key{} // vv := &Key{}
err = json.Unmarshal(data, &vv) // err = json.Unmarshal(data, &vv)
KeyList2 = append(KeyList2, vv) // KeyList2 = append(KeyList2, vv)
} // }
globals.SugarLogger.Debugf("jdshop key refreshed..") globals.SugarLogger.Debugf("jdshop key refreshed..")
} }
func GetKey(keySign, vendorOrgCode string) (key string) { func GetKey(keySign, vendorOrgCode string) (key string) {
if vendorOrgCode == "1" { // if vendorOrgCode == "1" {
for _, v := range KeyList { for _, v := range KeyList {
data, _ := base64.StdEncoding.DecodeString(v.ID) data, _ := base64.StdEncoding.DecodeString(v.ID)
if keySign == hex.EncodeToString(data) { if keySign == hex.EncodeToString(data) {
return v.KeyString return v.KeyString
} }
} }
} else { // } else {
for _, v := range KeyList2 { // for _, v := range KeyList2 {
data, _ := base64.StdEncoding.DecodeString(v.ID) // data, _ := base64.StdEncoding.DecodeString(v.ID)
if keySign == hex.EncodeToString(data) { // if keySign == hex.EncodeToString(data) {
return v.KeyString // return v.KeyString
} // }
} // }
} // }
globals.SugarLogger.Debugf("no key can equal..") globals.SugarLogger.Debugf("no key can equal..")
return key 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 { if status == model.OrderStatusCanceled {
err = ChangeOrderStatus(order.VendorOrderID, model.OrderStatusCanceled, "订单在京东商城已被取消！") err = ChangeOrderStatus(order.VendorOrderID, model.OrderStatusCanceled, "订单在京东商城已被取消！")
} else { } else {
if jxutils.GetSaleStoreIDFromOrder(order) != model.JdShopMainStoreID && jxutils.GetSaleStoreIDFromOrder(order) != model.JdShopMainStoreID2 { if jxutils.GetSaleStoreIDFromOrder(order) != model.JdShopMainStoreID {
err = ChangeOrderStatus(order.VendorOrderID, model.OrderStatusFinishedPickup, "自动拣货完成") err = ChangeOrderStatus(order.VendorOrderID, model.OrderStatusFinishedPickup, "自动拣货完成")
if status == model.OrderStatusAccepted { if status == model.OrderStatusAccepted {
err = p.OrderExport(jxcontext.AdminCtx, order.VendorOrderID, order.VendorOrderID, true) 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 != "" { if storeDetail.IDCardFront != "" {
data2, _, _ := jxutils.DownloadFileByURL(storeDetail.IDCardFront) data2, _, _ := jxutils.DownloadFileByURL(storeDetail.IDCardFront)
fileName := storeDetail.IDCardFront[strings.LastIndex(storeDetail.IDCardFront, "/")+1 : len(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 { } else {
data2, _, _ := jxutils.DownloadFileByURL("http://image.jxc4.com/image/a9bfc170a950ab9a4c76bd10b48b222b.tem.jpg") data2, _, _ := jxutils.DownloadFileByURL("http://image.jxc4.com/image/a9bfc170a950ab9a4c76bd10b48b222b.tem.jpg")
fileName := "a9bfc170a950ab9a4c76bd10b48b222b.tem.jpg" fileName := "a9bfc170a950ab9a4c76bd10b48b222b.tem.jpg"
url3, _ = api.JdShop2API.UploadImageNew(data2, fileName) url3, _ = api.JdShopAPI.UploadImageNew(data2, fileName)
} }
if storeDetail.IDCode == "" { if storeDetail.IDCode == "" {
idCode = "610126198012230014" idCode = "610126198012230014"

202
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) { func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
if globals.EnableJdShopWrite { if globals.EnableJdShopWrite {
if vendorStoreID == model.JdShopMainVendorStoreID || vendorStoreID == model.JdShopMainVendorStoreID2 { if vendorStoreID == model.JdShopMainVendorStoreID {
for _, v := range storeSkuList { for _, v := range storeSkuList {
//判断京东商城上是否有这个商品了，如果有就是添加规格而不是创建商品 //判断京东商城上是否有这个商品了，如果有就是添加规格而不是创建商品
//如果是京东商城2，是下架的商品，弄上架 //如果是京东商城2，是下架的商品，弄上架
@@ -56,7 +56,7 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
break break
} }
} }
if v.VendorOrgCode == "2" && flag2 { if flag2 {
err = getAPI(v.VendorOrgCode).WareDoUpdate("op", utils.Int64ToStr(v.JdsWareID)) err = getAPI(v.VendorOrgCode).WareDoUpdate("op", utils.Int64ToStr(v.JdsWareID))
} else { } else {
if result.TotalItem > 0 && len(result.Data) > 0 && flag { if result.TotalItem > 0 && len(result.Data) > 0 && flag {
@@ -80,7 +80,7 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
} }
var wareSaveSkus []*jdshopapi.WareSaveSkus var wareSaveSkus []*jdshopapi.WareSaveSkus
//先把已有的规格放进去 //先把已有的规格放进去
if v.VendorOrgCode == "2" { // if v.VendorOrgCode == "2" {
wareResult, _ := getAPI(v.VendorOrgCode).FindWareById(wareSaveParam.WareID) wareResult, _ := getAPI(v.VendorOrgCode).FindWareById(wareSaveParam.WareID)
if wareResult != nil { if wareResult != nil {
for _, v := range wareResult.Images { for _, v := range wareResult.Images {
@@ -110,27 +110,27 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
wareSaveSkus = append(wareSaveSkus, sku) wareSaveSkus = append(wareSaveSkus, sku)
} }
} }
} // }
for _, vv := range v.StoreSkuSyncInfoJds { for _, vv := range v.StoreSkuSyncInfoJds {
v.JdsWareID = result.Data[0].WareID v.JdsWareID = result.Data[0].WareID
vv.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) wareSaveSkus = append(wareSaveSkus, wareSaveSku)
if err != nil { if err != nil {
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品") failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
return failedList, err return failedList, err
} }
if v.VendorOrgCode == "1" { // if v.VendorOrgCode == "1" {
vendorSkuID, err := getAPI(v.VendorOrgCode).UpdateSkus(updateSkusParam) // vendorSkuID, err := getAPI(v.VendorOrgCode).UpdateSkus(updateSkusParam)
if strings.Contains(err.Error(), "cookie可能过期了") { // if strings.Contains(err.Error(), "cookie可能过期了") {
err = nil // err = nil
} // }
if err != nil { // if err != nil {
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品") // failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
return failedList, err // return failedList, err
} // }
vv.VendorSkuID = vendorSkuID // vv.VendorSkuID = vendorSkuID
} else { // } else {
wareSaveParam.Skus = wareSaveSkus wareSaveParam.Skus = wareSaveSkus
if wareResult, err2 := getAPI(v.VendorOrgCode).WareSave(wareSaveParam); err2 == nil { if wareResult, err2 := getAPI(v.VendorOrgCode).WareSave(wareSaveParam); err2 == nil {
for _, vvv := range wareResult { for _, vvv := range wareResult {
@@ -144,10 +144,10 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
err = getAPI(v.VendorOrgCode).StoreSkuBindStore(true, []string{vv.VendorSkuID}, nil) err = getAPI(v.VendorOrgCode).StoreSkuBindStore(true, []string{vv.VendorSkuID}, nil)
} }
} }
} // }
} }
} else { } else {
createSkuParamWare, createSkuParamSkus, wareSaveParam, err := buildCreateWareParam(v) _, _, wareSaveParam, err := buildCreateWareParam(v)
if err != nil { if err != nil {
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品") failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
return failedList, err return failedList, err
@@ -156,34 +156,34 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
wareID int64 wareID int64
resultAttrs = make(map[string]int64) resultAttrs = make(map[string]int64)
) )
if v.VendorOrgCode == "1" { // if v.VendorOrgCode == "1" {
createSkuResult, err2 := getAPI(v.VendorOrgCode).CreateWare(createSkuParamWare, createSkuParamSkus) // createSkuResult, err2 := getAPI(v.VendorOrgCode).CreateWare(createSkuParamWare, createSkuParamSkus)
err = err2 // err = err2
if strings.Contains(err.Error(), "cookie可能过期了") { // if strings.Contains(err.Error(), "cookie可能过期了") {
err = nil // err = nil
} // }
wareID = createSkuResult.WareID // wareID = createSkuResult.WareID
var paramAttrs = make(map[string]*jdshopapi.CreateSkuParamSkus) // var paramAttrs = make(map[string]*jdshopapi.CreateSkuParamSkus)
for _, vv := range createSkuParamSkus { // for _, vv := range createSkuParamSkus {
for _, vvv := range vv.SaleAttrs { // for _, vvv := range vv.SaleAttrs {
paramAttrs[vvv.AttrValues[0]] = vv // paramAttrs[vvv.AttrValues[0]] = vv
} // }
} // }
for _, vv1 := range createSkuResult.Skus { // for _, vv1 := range createSkuResult.Skus {
for _, vvv1 := range vv1.SaleAttrs { // for _, vvv1 := range vv1.SaleAttrs {
if paramAttrs[vvv1.AttrValues[0]] != nil { // if paramAttrs[vvv1.AttrValues[0]] != nil {
resultAttrs[paramAttrs[vvv1.AttrValues[0]].OuterID] = vv1.SkuID // resultAttrs[paramAttrs[vvv1.AttrValues[0]].OuterID] = vv1.SkuID
} // }
} // }
} // }
for _, vv2 := range v.StoreSkuSyncInfoJds { // for _, vv2 := range v.StoreSkuSyncInfoJds {
vv2.JdsWareID = createSkuResult.WareID // vv2.JdsWareID = createSkuResult.WareID
if resultAttrs[utils.Int2Str(vv2.SkuID)] != 0 { // if resultAttrs[utils.Int2Str(vv2.SkuID)] != 0 {
vv2.VendorSkuID = utils.Int64ToStr(resultAttrs[utils.Int2Str(vv2.SkuID)]) // vv2.VendorSkuID = utils.Int64ToStr(resultAttrs[utils.Int2Str(vv2.SkuID)])
} // }
} // }
} else { // } else {
var createSkuResult []*jdshopapi.WareSaveResult var createSkuResult []*jdshopapi.WareSaveResult
for i := 0; i < 10; i++ { for i := 0; i < 10; i++ {
createSkuResult, err = getAPI(v.VendorOrgCode).WareSave(wareSaveParam) createSkuResult, err = getAPI(v.VendorOrgCode).WareSave(wareSaveParam)
@@ -221,7 +221,7 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
} }
} }
} }
} // }
if err != nil { if err != nil {
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品") failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
return failedList, err return failedList, err
@@ -255,8 +255,8 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
//如果是普通店关注商品 //如果是普通店关注商品
for _, v := range storeSkuList { for _, v := range storeSkuList {
for _, vv := range v.StoreSkuSyncInfoJds { for _, vv := range v.StoreSkuSyncInfoJds {
if vv.VendorOrgCode == "2" { // if vv.VendorOrgCode == "2" {
storeSkus, _ := dao.GetStoresSkusInfo(dao.GetDB(), []int{model.JdShopMainStoreID2}, []int{vv.SkuID}) storeSkus, _ := dao.GetStoresSkusInfo(dao.GetDB(), []int{model.JdShopMainStoreID}, []int{vv.SkuID})
if len(storeSkus) > 0 { if len(storeSkus) > 0 {
for _, storeSku := range storeSkus { for _, storeSku := range storeSkus {
if storeSku.JdsID != 0 { if storeSku.JdsID != 0 {
@@ -286,7 +286,7 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
} }
} }
} }
} // }
} }
} }
} }
@@ -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) { 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 { if vendorStoreID == model.JdShopMainVendorStoreID {
for _, v := range storeSkuList { for _, v := range storeSkuList {
name := filterSensitiveWord(v.Name) 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) { 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 { for _, v := range storeSkuList {
if v.IsDeletedBySku { if v.IsDeletedBySku {
err = getAPI(v.VendorOrgCode).DeleteSku(utils.Str2Int64(v.VendorSkuID)) err = getAPI(v.VendorOrgCode).DeleteSku(utils.Str2Int64(v.VendorSkuID))
@@ -483,9 +483,9 @@ func (p *PurchaseHandler) GetStoreSkusFullInfo(ctx *jxcontext.Context, parentTas
pageNo = 1 pageNo = 1
pageSize = 20 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++ { 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 { if err == nil {
for _, v := range result2 { for _, v := range result2 {
if skuName := vendorSku2Jx2(v); skuName != nil { 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) { 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 { if globals.EnableJdShopWrite {
var stock = 0 // var stock = 0
for _, v := range storeSkuList { for _, v := range storeSkuList {
if storeID == model.JdShopMainStoreID { // if storeID == model.JdShopMainStoreID {
if status == model.SkuStatusNormal { // if status == model.SkuStatusNormal {
stock = 9999 // stock = 9999
} // }
if v.JdsStockSwitch == model.NO { // if v.JdsStockSwitch == model.NO {
stock = 0 // stock = 0
} // }
err = getAPI(v.VendorOrgCode).UpdateSkuStock(utils.Str2Int(v.VendorSkuID), stock) // err = getAPI(v.VendorOrgCode).UpdateSkuStock(utils.Str2Int(v.VendorSkuID), stock)
} else if storeID == model.JdShopMainStoreID2 { // } else {
// if v.VendorOrgCode == "1" {
} else { // storeSkus, err2 := dao.GetStoresSkusInfo(dao.GetDB(), []int{model.JdShopMainStoreID}, []int{v.SkuID})
if v.VendorOrgCode == "1" { // err = err2
storeSkus, err2 := dao.GetStoresSkusInfo(dao.GetDB(), []int{model.JdShopMainStoreID}, []int{v.SkuID}) // if len(storeSkus) > 0 {
err = err2 // if storeSkus[0].JdsID != 0 && vendorStoreID != "" {
if len(storeSkus) > 0 { // if storeSkus[0].Status == model.SkuStatusNormal {
if storeSkus[0].JdsID != 0 && vendorStoreID != "" { // stock = 9999
if storeSkus[0].Status == model.SkuStatusNormal { // }
stock = 9999 // err = getAPI(v.VendorOrgCode).UpdateSkuSiteStock(storeSkus[0].JdsID, stock, utils.Str2Int(vendorStoreID))
} // }
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 {
} else {
if vendorSkuID, err := getMainStoreVendorSkuID(model.JdShopMainStoreID2, v.SkuID); err == nil && vendorSkuID != 0 {
err = getAPI(v.VendorOrgCode).StoreWareDoUpdate(status, vendorSkuID, vendorStoreID) err = getAPI(v.VendorOrgCode).StoreWareDoUpdate(status, vendorSkuID, vendorStoreID)
} }
} // }
} // }
} }
if err != nil { if err != nil {
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "修改商品库存") 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) { func (p *PurchaseHandler) UpdateStoreSkusPrice(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
if globals.EnableJdShopWrite { if globals.EnableJdShopWrite {
for _, v := range storeSkuList { for _, v := range storeSkuList {
if storeID == model.JdShopMainStoreID { // if storeID == model.JdShopMainStoreID {
err = getAPI(v.VendorOrgCode).UpdateSkuJdPrice(utils.Str2Int(v.VendorSkuID), jxutils.IntPrice2Standard(v.VendorPrice)) // err = getAPI(v.VendorOrgCode).UpdateSkuJdPrice(utils.Str2Int(v.VendorSkuID), jxutils.IntPrice2Standard(v.VendorPrice))
} else if storeID == model.JdShopMainStoreID2 { // } else if storeID == model.JdShopMainStoreID2 {
//修改京东商城商品库价格 // //修改京东商城商品库价格
} else { // } else {
if v.VendorOrgCode == "1" { // if v.VendorOrgCode == "1" {
// null // // null
} else { // } else {
if vendorSkuID, err := getMainStoreVendorSkuID(model.JdShopMainStoreID2, v.SkuID); err == nil && vendorSkuID != 0 { 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) err = getAPI(v.VendorOrgCode).StoreUpdatePrice(utils.Float64ToStr(jxutils.IntPrice2Standard(v.VendorPrice)), vendorSkuID, vendorStoreID)
} }
} // }
} // }
if err != nil { if err != nil {
failedList = append(failedList, putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "修改商品价格")...) 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) { func (p *PurchaseHandler) UpdateStoreSkusStock(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
if globals.EnableJdShopWrite { if globals.EnableJdShopWrite {
for _, v := range storeSkuList { for _, v := range storeSkuList {
if storeID == model.JdShopMainStoreID { // if storeID == model.JdShopMainStoreID {
} else if storeID == model.JdShopMainStoreID2 { // } else if storeID == model.JdShopMainStoreID2 {
} else { // } else {
if v.VendorOrgCode == "1" { // if v.VendorOrgCode == "1" {
} else { // } else {
if vendorSkuID, err := getMainStoreVendorSkuID(model.JdShopMainStoreID2, v.SkuID); err == nil && vendorSkuID != 0 { if vendorSkuID, err := getMainStoreVendorSkuID(model.JdShopMainStoreID, v.SkuID); err == nil && vendorSkuID != 0 {
err = getAPI(v.VendorOrgCode).StoreUpdateStock(v.Stock, vendorSkuID, vendorStoreID) err = getAPI(v.VendorOrgCode).StoreUpdateStock(v.Stock, vendorSkuID, vendorStoreID)
} }
} // }
} // }
} }
if err != nil { if err != nil {
failedList = append(failedList, putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "修改商品库存")...) 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) { 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) status, err2 := updateOrCreateCategories(storeCat, true)
err = err2 err = err2
if status == -1 { 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) { 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) status, err2 := updateOrCreateCategories(storeCat, false)
err = err2 err = err2
if status == -1 { 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) { 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)) _, err = api.JdShopAPI.DeleteShopCategory(utils.Str2Int64(vendorCatID))
} }
return err return err

8
conf/app.conf
View File

@@ -220,10 +220,10 @@ jdEclpAccessToken = "161eff890f2f4fbda942447f85843377wzmo"
jdEclpAppKey = "0D397F05CF11C51BCDCC81744680EBC3" jdEclpAppKey = "0D397F05CF11C51BCDCC81744680EBC3"
jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933" jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933"
jdShopAccessToken = "de8157b447584885910f429011e49cb93yjq" # jdShopAccessToken = "de8157b447584885910f429011e49cb93yjq"
jdShopAppKey = "E1D746D42474D5F1F1A10CECE75D99F6" # jdShopAppKey = "E1D746D42474D5F1F1A10CECE75D99F6"
jdShopAppSecret = "efa7e1d1a22640fa990e6cf164b28608" # 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" # 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" jdShopAccessToken2 = "9ad9cf5fc8b140b19a1dbbb700b47676kown"
jdShopAppKey2 = "D5E8352BE0786ED16F77B4548F62F09A" jdShopAppKey2 = "D5E8352BE0786ED16F77B4548F62F09A"

2
controllers/jx_order.go
View File

@@ -1120,7 +1120,7 @@ func (c *OrderController) SendJdwlForJdsOrder() {
// @router /SaveJdsOrders [post] // @router /SaveJdsOrders [post]
func (c *OrderController) SaveJdsOrders() { func (c *OrderController) SaveJdsOrders() {
c.callSaveJdsOrders(func(params *tOrderSaveJdsOrdersParams) (retVal interface{}, errCode string, err error) { 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 return retVal, "", err
}) })
} }

6
globals/api/api.go
View File

@@ -56,7 +56,7 @@ var (
FakeJdAPI *jdapi.API FakeJdAPI *jdapi.API
JdEclpAPI *jdeclpapi.API JdEclpAPI *jdeclpapi.API
JdShopAPI *jdshopapi.API JdShopAPI *jdshopapi.API
JdShop2API *jdshopapi.API // JdShop2API *jdshopapi.API
ElmAPI *elmapi.API ElmAPI *elmapi.API
EbaiAPI *ebaiapi.API EbaiAPI *ebaiapi.API
@@ -153,8 +153,8 @@ func Init() {
JdEclpAPI = nil JdEclpAPI = nil
} }
if !beego.AppConfig.DefaultBool("disableJdShop", false) { if !beego.AppConfig.DefaultBool("disableJdShop", false) {
JdShopAPI = jdshopapi.New(beego.AppConfig.DefaultString("jdShopAccessToken", ""), beego.AppConfig.DefaultString("jdShopAppKey", ""), beego.AppConfig.DefaultString("jdShopAppSecret", "")) // 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("jdShopAccessToken2", ""), beego.AppConfig.DefaultString("jdShopAppKey2", ""), beego.AppConfig.DefaultString("jdShopAppSecret2", ""))
} else { } else {
JdShopAPI = nil JdShopAPI = nil
} }

6
globals/api/apimanager/apimanager.go
View File

@@ -61,11 +61,7 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{})
case model.VendorIDEBAI: case model.VendorIDEBAI:
pfAPI = api.EbaiAPI pfAPI = api.EbaiAPI
case model.VendorIDJDShop: case model.VendorIDJDShop:
if appOrgCode == "1" {
pfAPI = api.JdShopAPI pfAPI = api.JdShopAPI
} else {
pfAPI = api.JdShop2API
}
} }
return pfAPI return pfAPI
} }
@@ -83,7 +79,7 @@ func (a *APIManager) GetAppOrgCodeList(vendorID int) (appOrgCodeList []string) {
case model.VendorIDEBAI: case model.VendorIDEBAI:
appOrgCodeList = []string{api.EbaiAPI.GetSource()} appOrgCodeList = []string{api.EbaiAPI.GetSource()}
case model.VendorIDJDShop: case model.VendorIDJDShop:
appOrgCodeList = []string{"1", "2"} appOrgCodeList = []string{"2"}
} }
return appOrgCodeList return appOrgCodeList
} }