aa

business/model/dao/dao_order.go

@@ -85,28 +85,32 @@ func GetDeliveryOrders(db *DaoDB, userIDs []string, statuss []int, fromTime, toT
 			if addressList1, _, err := QueryUserDeliveryAddress(db, int64(v.DeliverySendID), nil, 0, 0, 0); err == nil && len(addressList1) > 0 {
 				v.DeliverySendInfo = addressList1[0]
 			} else {
-				v.DeliverySendInfo.ConsigneeName = v.SendName
-				v.DeliverySendInfo.ConsigneeMobile = v.SendMobile
-				v.DeliverySendInfo.Address = v.SendAddress
-				v.DeliverySendInfo.AutoAddress = v.SendAutoAddress
-				v.DeliverySendInfo.CityCode = v.SendCityCode
-				v.DeliverySendInfo.DistrictCode = v.SendDistrictCode
-				v.DeliverySendInfo.DetailAddress = v.SendDetailAddress
-				v.DeliverySendInfo.Lng = v.SendLng
-				v.DeliverySendInfo.Lat = v.SendLat
+				sendInfo := &UserDeliveryAddressEx{}
+				sendInfo.ConsigneeName = v.SendName
+				sendInfo.ConsigneeMobile = v.SendMobile
+				sendInfo.Address = v.SendAddress
+				sendInfo.AutoAddress = v.SendAutoAddress
+				sendInfo.CityCode = v.SendCityCode
+				sendInfo.DistrictCode = v.SendDistrictCode
+				sendInfo.DetailAddress = v.SendDetailAddress
+				sendInfo.Lng = v.SendLng
+				sendInfo.Lat = v.SendLat
+				v.DeliverySendInfo = sendInfo
 			}
 			if addressList2, _, err := QueryUserDeliveryAddress(db, int64(v.DeliveryReceiveID), nil, 0, 0, 0); err == nil && len(addressList2) > 0 {
 				v.DeliveryReceiveInfo = addressList2[0]
 			} else {
-				v.DeliveryReceiveInfo.ConsigneeName = v.ReceiveName
-				v.DeliveryReceiveInfo.ConsigneeMobile = v.ReceiveMobile
-				v.DeliveryReceiveInfo.Address = v.ReceiveAddress
-				v.DeliveryReceiveInfo.AutoAddress = v.ReceiveAutoAddress
-				v.DeliveryReceiveInfo.CityCode = v.ReceiveCityCode
-				v.DeliveryReceiveInfo.DistrictCode = v.ReceiveDistrictCode
-				v.DeliveryReceiveInfo.DetailAddress = v.ReceiveDetailAddress
-				v.DeliveryReceiveInfo.Lng = v.ReceiveLng
-				v.DeliveryReceiveInfo.Lat = v.ReceiveLat
+				receiveInfo := &UserDeliveryAddressEx{}
+				receiveInfo.ConsigneeName = v.ReceiveName
+				receiveInfo.ConsigneeMobile = v.ReceiveMobile
+				receiveInfo.Address = v.ReceiveAddress
+				receiveInfo.AutoAddress = v.ReceiveAutoAddress
+				receiveInfo.CityCode = v.ReceiveCityCode
+				receiveInfo.DistrictCode = v.ReceiveDistrictCode
+				receiveInfo.DetailAddress = v.ReceiveDetailAddress
+				receiveInfo.Lng = v.ReceiveLng
+				receiveInfo.Lat = v.ReceiveLat
+				v.DeliveryReceiveInfo = receiveInfo
 			}
 		}
 		pagedInfo.Data = dOrders