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:
苏尹岚
2020-12-01 17:48:25 +08:00
parent 303a638aca
commit 06cf6bec1e
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1610,8 +1610,10 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
` `
sqlParams := []interface{}{order.VendorOrderID2} sqlParams := []interface{}{order.VendorOrderID2}
err = dao.GetRows(db, &goodsOrders, sql, sqlParams) err = dao.GetRows(db, &goodsOrders, sql, sqlParams)
if goodsOrders[0].Status != model.OrderStatusCanceled { for _, order := range goodsOrders {
err = jdshop.ChangeOrderStatus(goodsOrders[0].VendorOrderID, model.OrderStatusCanceled, "订单转移被取消") if order.Status != model.OrderStatusCanceled {
err = jdshop.ChangeOrderStatus(order.VendorOrderID, model.OrderStatusCanceled, "订单转移被取消")
}
} }
// suffix := utils.Str2Int(goodsOrders[0].VendorOrderID[12:len(goodsOrders[0].VendorOrderID)]) // suffix := utils.Str2Int(goodsOrders[0].VendorOrderID[12:len(goodsOrders[0].VendorOrderID)])
// suffix++ // suffix++
@@ -1663,7 +1665,11 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
if err != nil { if err != nil {
return "", err return "", err
} }
if order.VendorOrgCode == "1" {
order.Status = model.OrderStatusAccepted order.Status = model.OrderStatusAccepted
} else {
order.Status = model.OrderStatusNew
}
} }
for _, sku := range skus { for _, sku := range skus {
sku.VendorOrderID = order.VendorOrderID sku.VendorOrderID = order.VendorOrderID

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

@@ -53,13 +53,20 @@ func (p *PurchaseHandler) GetOrderStatus(vendorOrgCode, vendorOrderID string) (s
} }
func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) { func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) {
var status int var (
status int
remark string
)
if isAcceptIt { if isAcceptIt {
status = model.OrderStatusAccepted status = model.OrderStatusAccepted
//京东商城第二个号要自动接单
if order.VendorOrgCode == "2" {
}
} else { } else {
status = model.OrderStatusCanceled status = model.OrderStatusCanceled
} }
return ChangeOrderStatus(order.VendorOrderID, status, "") return ChangeOrderStatus(order.VendorOrderID, status, remark)
} }
func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) { func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) {
status, err := p.GetOrderStatus("", order.VendorOrderID2) status, err := p.GetOrderStatus("", order.VendorOrderID2)