From 97b46b81ff2243485762abd0ea22cfa5683e9ccb Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 30 Nov 2023 17:38:08 +0800 Subject: [PATCH] jd pickGoods --- business/partner/purchase/jd/order.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index 02169bcc9..4e5ffb477 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -399,6 +399,18 @@ func (c *PurchaseHandler) callbackMsg2Status(msg *jdapi.CallbackOrderMsg) *model orderStatus.VendorStatus = jdapi.CallbackMsgOrderAddTips } orderStatus.Status = getStatusFromVendorStatus(orderStatus.VendorStatus) + + //todo 获取门店配送方式 京东京东 + order, _, err := dao.GetOrders(dao.GetDB(), nil, false, false, "", "", false, nil, false, "", map[string]interface{}{ + "vendorOrderID": orderStatus.VendorOrderID, + }, 0, 0) + if err == nil && len(order) > 0 { + if order[0].DeliveryType == model.OrderDeliveryTypeStoreSelf && orderStatus.Status == model.OrderStatusDelivering { //门店自送且在配送中 + orderStatus.Status = model.OrderStatusFinishedPickup //修改为捡货完成 + } + globals.SugarLogger.Debugf("jdjd callbackMsg2Status status=%d,vendorStatus=%s", orderStatus.Status, orderStatus.VendorStatus) + } + return orderStatus }