liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
苏尹岚
2020-12-15 15:23:37 +08:00
parent 682e8d2947
commit fd336262f7
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
business/model/dao/dao_order.go
View File

@@ -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 { if addressList1, _, err := QueryUserDeliveryAddress(db, int64(v.DeliverySendID), nil, 0, 0, 0); err == nil && len(addressList1) > 0 {
v.DeliverySendInfo = addressList1[0] v.DeliverySendInfo = addressList1[0]
} else { } else {
v.DeliverySendInfo.ConsigneeName = v.SendName sendInfo := &UserDeliveryAddressEx{}
v.DeliverySendInfo.ConsigneeMobile = v.SendMobile sendInfo.ConsigneeName = v.SendName
v.DeliverySendInfo.Address = v.SendAddress sendInfo.ConsigneeMobile = v.SendMobile
v.DeliverySendInfo.AutoAddress = v.SendAutoAddress sendInfo.Address = v.SendAddress
v.DeliverySendInfo.CityCode = v.SendCityCode sendInfo.AutoAddress = v.SendAutoAddress
v.DeliverySendInfo.DistrictCode = v.SendDistrictCode sendInfo.CityCode = v.SendCityCode
v.DeliverySendInfo.DetailAddress = v.SendDetailAddress sendInfo.DistrictCode = v.SendDistrictCode
v.DeliverySendInfo.Lng = v.SendLng sendInfo.DetailAddress = v.SendDetailAddress
v.DeliverySendInfo.Lat = v.SendLat 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 { if addressList2, _, err := QueryUserDeliveryAddress(db, int64(v.DeliveryReceiveID), nil, 0, 0, 0); err == nil && len(addressList2) > 0 {
v.DeliveryReceiveInfo = addressList2[0] v.DeliveryReceiveInfo = addressList2[0]
} else { } else {
v.DeliveryReceiveInfo.ConsigneeName = v.ReceiveName receiveInfo := &UserDeliveryAddressEx{}
v.DeliveryReceiveInfo.ConsigneeMobile = v.ReceiveMobile receiveInfo.ConsigneeName = v.ReceiveName
v.DeliveryReceiveInfo.Address = v.ReceiveAddress receiveInfo.ConsigneeMobile = v.ReceiveMobile
v.DeliveryReceiveInfo.AutoAddress = v.ReceiveAutoAddress receiveInfo.Address = v.ReceiveAddress
v.DeliveryReceiveInfo.CityCode = v.ReceiveCityCode receiveInfo.AutoAddress = v.ReceiveAutoAddress
v.DeliveryReceiveInfo.DistrictCode = v.ReceiveDistrictCode receiveInfo.CityCode = v.ReceiveCityCode
v.DeliveryReceiveInfo.DetailAddress = v.ReceiveDetailAddress receiveInfo.DistrictCode = v.ReceiveDistrictCode
v.DeliveryReceiveInfo.Lng = v.ReceiveLng receiveInfo.DetailAddress = v.ReceiveDetailAddress
v.DeliveryReceiveInfo.Lat = v.ReceiveLat receiveInfo.Lng = v.ReceiveLng
receiveInfo.Lat = v.ReceiveLat
v.DeliveryReceiveInfo = receiveInfo
} }
} }
pagedInfo.Data = dOrders pagedInfo.Data = dOrders