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

订单转移后不停止跳读

Browse Source
This commit is contained in:
苏尹岚
2020-06-19 09:25:02 +08:00
parent f23cb892c0
commit c671db77f1
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1092,6 +1092,7 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
TotalShopMoney: utils.Float64TwoInt64(math.Round(utils.Int64ToFloat64(orderDetail.ActualPayPrice) * jdshopapi.JdsPayPercentage)), TotalShopMoney: utils.Float64TwoInt64(math.Round(utils.Int64ToFloat64(orderDetail.ActualPayPrice) * jdshopapi.JdsPayPercentage)),
DeliveryFlag: model.OrderDeliveryFlagMaskScheduleDisabled, DeliveryFlag: model.OrderDeliveryFlagMaskScheduleDisabled,
StatusTime: utils.Str2Time(jdsOrder.OrderCreateTime + ":00"), StatusTime: utils.Str2Time(jdsOrder.OrderCreateTime + ":00"),
OrderSeq: 0,
} }
//获取真实手机号 //获取真实手机号
fakeMobile, err := api.JdShopAPI.PhoneSensltiveInfo(order.VendorOrderID2, orderDetail.MobileKey) fakeMobile, err := api.JdShopAPI.PhoneSensltiveInfo(order.VendorOrderID2, orderDetail.MobileKey)
@@ -1130,6 +1131,7 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
} else { } else {
globals.SugarLogger.Errorf("未知的京东商城订单状态！status : %v", jdsOrder.OrderStatus) globals.SugarLogger.Errorf("未知的京东商城订单状态！status : %v", jdsOrder.OrderStatus)
} }
setJdsOrderSeq(order)
for _, v := range jdsOrder.OrderItems { for _, v := range jdsOrder.OrderItems {
sku := &model.OrderSku{ sku := &model.OrderSku{
VendorID: model.VendorIDJDShop, VendorID: model.VendorIDJDShop,
@@ -1158,6 +1160,12 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
return orders, err return orders, err
} }
func setJdsOrderSeq(orders *model.GoodsOrder) {
// sql := `
// SELECT * FROM
// `
}
func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int) (vendorOrderIDJds string, err error) { func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int) (vendorOrderIDJds string, err error) {
globals.SugarLogger.Debugf("jds TransferJdsOrder vendorOrderID: %v, storeID : %v", vendorOrderID, storeID) globals.SugarLogger.Debugf("jds TransferJdsOrder vendorOrderID: %v, storeID : %v", vendorOrderID, storeID)
var ( var (
@@ -1221,6 +1229,9 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
sku.ID = 0 sku.ID = 0
order.Skus = append(order.Skus, sku) order.Skus = append(order.Skus, sku)
} }
if storeID != model.JdShopMainStoreID {
order.DeliveryFlag = model.NO
}
order.Status = model.OrderStatusNew order.Status = model.OrderStatusNew
err = partner.CurOrderManager.OnOrderNew(order, model.Order2Status(order)) err = partner.CurOrderManager.OnOrderNew(order, model.Order2Status(order))
vendorOrderIDJds = order.VendorOrderID vendorOrderIDJds = order.VendorOrderID