diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 86ed1cd0b..3cb920930 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1530,6 +1530,12 @@ func TmpGetJxBadCommentsByStoreId(ctx *jxcontext.Context, keyword string, storeI return retVal, err } +type GetStoreCourierMapsResult struct { + storeCourierMaps *model.StoreCourierMap + CourierAddress string `json:"courierAddress"` + CourierPhone string `json:"courierPhone"` +} + func GetStoreCourierMaps(ctx *jxcontext.Context, db *dao.DaoDB, storeID int, vendorID int) (storeCourierMaps []*model.StoreCourierMap, err error) { cond := map[string]interface{}{ model.FieldStoreID: storeID, diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go index 7f765b96f..e56bc527f 100644 --- a/business/partner/purchase/jdshop/order.go +++ b/business/partner/purchase/jdshop/order.go @@ -68,7 +68,7 @@ func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo err = ChangeOrderStatus(order.VendorOrderID, model.OrderStatusCanceled, "订单在京东商城已被取消!") } else { err = ChangeOrderStatus(order.VendorOrderID, model.OrderStatusFinishedPickup, "自动拣货完成") - err = p.OrderExport(jxcontext.AdminCtx, order.VendorOrderID, order.VendorWaybillID, true) + err = p.OrderExport(jxcontext.AdminCtx, order.VendorOrderID, order.VendorOrderID, true) } return err }