jd pickGoods

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
 }