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 14:30:30 +08:00
parent a216e42922
commit ab078d7fd9
3 changed files with 91 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,9 +84,29 @@ func GetDeliveryOrders(db *DaoDB, userIDs []string, statuss []int, fromTime, toT
for _, v := range dOrders {
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
}
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
}
}
pagedInfo.Data = dOrders

52
business/model/order.go
View File

@@ -84,23 +84,41 @@ func (v *Order) TableIndex() [][]string {
type DeliveryOrder struct {
ModelIDCUL
VendorWaybillID string `orm:"column(vendor_waybill_id)" json:"vendorWaybillID"` //运单号
UserID string `orm:"column(user_id);size(48)" json:"userID"` //用户ID
DeliverySendID int `orm:"column(delivery_send_id)" json:"deliverySendID"` //寄件人地址ID
DeliveryReceiveID int `orm:"column(delivery_receive_id)" json:"deliveryReceiveID"` //取件人地址ID（收货人）
Status int `json:"status"` //运单状态
PayPrice int `json:"payPrice"` //支付金额
OrderFinishedAt time.Time `json:"orderFinishedAt"` //订单完成时间
Weight float64 `json:"weight"` //订单重量,单位kg
Vloumn float64 `json:"vloumn"` //订单体积，单位立方cm
Description string `json:"description"` //订单商品描述
PickUpStartTime time.Time `json:"pickUpStartTime"` //预约取件开始时间
PickUpEndTime time.Time `json:"pickUpEndTime"` //预约取件结束时间
PackageCount int `json:"packageCount"` //包裹数
ActualWeight float64 `json:"actualWeight"` //实际重量
IsWeight int `json:"isWeight"` //0代表未验重，1代表验重通过，2代表不通过
Comment string `orm:"size(255)" json:"comment"` //备注
JobOrderID string `orm:"column(job_order_id)" json:"jobOrderID"`
VendorWaybillID string `orm:"column(vendor_waybill_id)" json:"vendorWaybillID"` //运单号
UserID string `orm:"column(user_id);size(48)" json:"userID"` //用户ID
DeliverySendID int `orm:"column(delivery_send_id)" json:"deliverySendID"` //寄件人地址ID
SendName string `json:"sendName"`
SendMobile string `json:"sendMobile"`
SendAddress string `json:"sendAddress"`
SendDetailAddress string `json:"sendDetailAddress"`
SendLng float64 `json:"sendLng"`
SendLat float64 `json:"sendLat"`
SendAutoAddress string `json:"sendAutoAddress"`
SendCityCode int `json:"sendCityCode"`
SendDistrictCode int `json:"sendDistrictCode"`
DeliveryReceiveID int `orm:"column(delivery_receive_id)" json:"deliveryReceiveID"` //取件人地址ID（收货人）\
ReceiveName string `json:"receiveName"`
ReceiveMobile string `json:"receiveMobile"`
ReceiveAddress string `json:"receiveAddress"`
ReceiveDetailAddress string `json:"receiveDetailAddress"`
ReceiveLng float64 `json:"receiveLng"`
ReceiveLat float64 `json:"receiveLat"`
ReceiveAutoAddress string `json:"receiveAutoAddress"`
ReceiveCityCode int `json:"receiveCityCode"`
ReceiveDistrictCode int `json:"receiveDistrictCode"`
Status int `json:"status"` //运单状态
PayPrice int `json:"payPrice"` //支付金额
OrderFinishedAt time.Time `json:"orderFinishedAt"` //订单完成时间
Weight float64 `json:"weight"` //订单重量,单位kg
Vloumn float64 `json:"vloumn"` //订单体积，单位立方cm
Description string `json:"description"` //订单商品描述
PickUpStartTime time.Time `json:"pickUpStartTime"` //预约取件开始时间
PickUpEndTime time.Time `json:"pickUpEndTime"` //预约取件结束时间
PackageCount int `json:"packageCount"` //包裹数
ActualWeight float64 `json:"actualWeight"` //实际重量
IsWeight int `json:"isWeight"` //0代表未验重，1代表验重通过，2代表不通过
Comment string `orm:"size(255)" json:"comment"` //备注
JobOrderID string `orm:"column(job_order_id)" json:"jobOrderID"`
}
func (v *DeliveryOrder) TableUnique() [][]string {