From 0bc79ac9ba47895c653320ec4833e96fb3609f6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 5 Nov 2020 15:49:52 +0800
Subject: [PATCH] address

---
 business/jxstore/cms/job.go | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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,