This commit is contained in:
邹宗楠
2022-06-30 18:26:56 +08:00
parent d6b8097626
commit 0e7e9ec818
2 changed files with 13 additions and 9 deletions

View File

@@ -225,21 +225,24 @@ func QueryOrderDetail(typeCode int, orderNo string) (*bida.OrderDetail, error) {
}
// QueryUserOrderList 查询用户订单列表
func QueryUserOrderList(userId string, expressType, orderStatus int, pageNum, pageSize int) ([]*model.UserOrderList, error) {
func QueryUserOrderList(userId string, expressType, orderStatus int, pageNum, pageSize int, orderNo string) ([]*model.UserOrderList, error) {
sql := `
SELECT 
a.type,a.other_way_bill,a.local_way_bill,a.user_id,a.receive_address_id,a.sender_address_id,
a.create_at,a.order_status,a.channel_fee,add.consignee_name send_user_name,add2.consignee_name receive_user_name,
district.name sender_address,city.name receive_address
SELECT a.type,a.other_way_bill,a.local_way_bill,a.user_id,a.receive_address_id,a.sender_address_id,
a.created_at,a.order_status,a.channel_fee,add1.consignee_name send_user_name,add2.consignee_name receive_user_name,
district.name sender_address,city.name receive_address
FROM user_vendor_order a
LEFT JOIN user_delivery_address add ON a.sender_address_id = add.id
LEFT JOIN user_delivery_address add1 ON a.sender_address_id = add1.id
LEFT JOIN user_delivery_address add2 ON a.receive_address_id = add2.id
LEFT JOIN place district ON district.code = add.district_code
LEFT JOIN place city ON city.code = add2.district_code
LEFT JOIN place district ON district.code = add1.city_code
LEFT JOIN place city ON city.code = add2.city_code
WHERE a.user_id = ?
`
param := make([]interface{}, 0, 0)
param = append(param, userId)
if orderNo != "" {
sql = sql + ` a.other_way_bill = ? OR a.local_way_bill = ? `
param = append(param, orderNo, orderNo)
}
if expressType != 0 {
sql = sql + ` a.type = ? `
param = append(param, expressType)