This commit is contained in:
苏尹岚
2020-11-05 15:49:52 +08:00
parent fdd6b879fb
commit 0bc79ac9ba

View File

@@ -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,