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-06 11:18:42 +08:00
parent d5a5a259e7
commit 8c5d4abe7e
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1890,7 +1890,8 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
if orderE != nil { if orderE != nil {
continue continue
} }
orderDetail, err := api.JdShopAPI.OrderDetail(utils.Int64ToStr(jdsOrder.OrderID))
orderDetail, err := jdshop.GetAPI("2").OrderDetail(utils.Int64ToStr(jdsOrder.OrderID))
if err != nil { if err != nil {
globals.SugarLogger.Debugf("jds OrderDetail error: %v", err.Error()) globals.SugarLogger.Debugf("jds OrderDetail error: %v", err.Error())
continue continue
@@ -1916,10 +1917,10 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
DeliveryType: model.OrderDeliveryTypeStoreSelf, DeliveryType: model.OrderDeliveryTypeStoreSelf,
StatusTime: utils.Str2Time(jdsOrder.OrderCreateTime + ":00"), StatusTime: utils.Str2Time(jdsOrder.OrderCreateTime + ":00"),
OrderSeq: 0, OrderSeq: 0,
VendorOrgCode: "1", VendorOrgCode: "2",
} }
//获取真实手机号 //获取真实手机号
fakeMobile, err := api.JdShopAPI.PhoneSensltiveInfo(order.VendorOrderID2, orderDetail.MobileKey) fakeMobile, err := jdshop.GetAPI("2").PhoneSensltiveInfo(order.VendorOrderID2, orderDetail.MobileKey)
if err != nil { if err != nil {
globals.SugarLogger.Debugf("jds PhoneSensltiveInfo error: %v", err.Error()) globals.SugarLogger.Debugf("jds PhoneSensltiveInfo error: %v", err.Error())
continue continue
@@ -1950,12 +1951,13 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
order.BusinessType = model.BusinessTypeDingshida order.BusinessType = model.BusinessTypeDingshida
order.ExpectedDeliveredTime = utils.Str2Time(orderDetail.ExpectedDeliveredTime) order.ExpectedDeliveredTime = utils.Str2Time(orderDetail.ExpectedDeliveredTime)
order.PickDeadline = order.ExpectedDeliveredTime.Add(-time.Hour) order.PickDeadline = order.ExpectedDeliveredTime.Add(-time.Hour)
} else if jdsOrder.OrderStatus == jdshopapi.JdsOrderStatusWaittingExport { } else {
order.ExpectedDeliveredTime = order.OrderCreatedAt.Add(time.Hour) order.ExpectedDeliveredTime = order.OrderCreatedAt.Add(time.Hour)
order.BusinessType = model.BusinessTypeImmediate order.BusinessType = model.BusinessTypeImmediate
} else {
globals.SugarLogger.Errorf("未知的京东商城订单状态！status : %v", jdsOrder.OrderStatus)
} }
// else {
// globals.SugarLogger.Errorf("未知的京东商城订单状态！status : %v", jdsOrder.OrderStatus)
// }
//结算类型 //结算类型
storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), order.StoreID, model.VendorIDJDShop, "") storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), order.StoreID, model.VendorIDJDShop, "")

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

@@ -314,7 +314,7 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
if order.ExpectedDeliveredTime.Sub(order.OrderCreatedAt) <= time.Hour+time.Minute { if order.ExpectedDeliveredTime.Sub(order.OrderCreatedAt) <= time.Hour+time.Minute {
order.BusinessType = model.BusinessTypeImmediate order.BusinessType = model.BusinessTypeImmediate
} }
buildOrderTo102919(order) // buildOrderTo102919(order)
return order, err return order, err
} }

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

@@ -47,6 +47,14 @@ func getAPI(appOrgCode string) (apiObj *jdshopapi.API) {
return apiObj return apiObj
} }
func GetAPI(appOrgCode string) (apiObj *jdshopapi.API) {
apiObj = partner.CurAPIManager.GetAPI(model.VendorIDJDShop, appOrgCode).(*jdshopapi.API)
if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie2", model.ConfigTypeCookie, ""); err == nil {
apiObj.SetCookieWithStr(configs[0].Value)
}
return apiObj
}
func (p *PurchaseHandler) GetVendorID() int { func (p *PurchaseHandler) GetVendorID() int {
return model.VendorIDJDShop return model.VendorIDJDShop
} }

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

@@ -157,7 +157,7 @@ func (p *PurchaseHandler) AdjustOrder(ctx *jxcontext.Context, order *model.Goods
} }
func (p *PurchaseHandler) GetJdsOrders(ctx *jxcontext.Context, orderCreatedStart, orderCreatedEnd string, current, pageSize int) (orderResult *jdshopapi.AllOrdersResult, err error) { func (p *PurchaseHandler) GetJdsOrders(ctx *jxcontext.Context, orderCreatedStart, orderCreatedEnd string, current, pageSize int) (orderResult *jdshopapi.AllOrdersResult, err error) {
orderResult, err = api.JdShopAPI.AllOrders(&jdshopapi.AllOrdersParam{ orderResult, err = getAPI("2").AllOrders(&jdshopapi.AllOrdersParam{
Current: current, Current: current,
PageSize: pageSize, PageSize: pageSize,
OrderCreateDateRange: []string{orderCreatedStart, orderCreatedEnd}, OrderCreateDateRange: []string{orderCreatedStart, orderCreatedEnd},