diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go index af73104d1..8871f3794 100644 --- a/business/jxstore/cms/job.go +++ b/business/jxstore/cms/job.go @@ -636,6 +636,19 @@ func SendJdDelivery(ctx *jxcontext.Context, dOrder *model.DeliveryOrder) (errCod if receiveDeliveryList[0].ParentCode == 650000 || receiveDeliveryList[0].ParentCode == 540000 { dOrder.PayPrice = 4500 } + + modifyAddress := func(deliveryAddress *dao.UserDeliveryAddressEx) { + deliveryAddress.Address = deliveryAddress.DistrictName + deliveryAddress.Address + deliveryAddress.Address = deliveryAddress.CityName + deliveryAddress.Address + if place1, err := dao.GetPlaceByCode(db, deliveryAddress.CityCode); err == nil { + if place2, err2 := dao.GetPlaceByCode(db, place1.ParentCode); err2 == nil { + deliveryAddress.Address = place2.Name + deliveryAddress.Address + } + } + } + modifyAddress(sendDeliveryList[0]) + modifyAddress(receiveDeliveryList[0]) + dao.WrapAddIDCULEntity(dOrder, ctx.GetUserName()) if vendorWaybillID, err := api.JdEclpAPI.WaybillReceive(&jdeclpapi.WaybillReceiveParam{ SalePlat: jdeclpapi.SalePlatSourceDelivery,