diff --git a/business/q_bida/q_bida_server.go b/business/q_bida/q_bida_server.go index 9ec253c69..c33db74ae 100644 --- a/business/q_bida/q_bida_server.go +++ b/business/q_bida/q_bida_server.go @@ -5,6 +5,7 @@ import ( "fmt" bida "git.rosy.net.cn/baseapi/platformapi/q_bida" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" @@ -135,5 +136,36 @@ func QueryOrderDetail(typeCode int, orderNo string) (*bida.OrderDetail, error) { return nil, err } - detail.ExpressFee = data.ChannelFee + detail.ExpressFee = utils.Float64ToStr(data.ChannelFee) + return detail, nil +} + +// QueryUserOrderList 查询用户订单列表 +func QueryUserOrderList(userId string, expressType, orderStatus int, pageNum, pageSize int) { + 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, + city.col_areaName sender_address,city2.col_areaName 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 add2 ON a.receive_address_id = add2.id + LEFT JOIN jde_city city ON city.clo_tencentAddressCode = add.district_code + LEFT JOIN jde_city city2 ON city2.clo_tencentAddressCode = add2.district_code + WHERE a.user_id = ? + ` + param := make([]interface{}, 0, 0) + param = append(param, userId) + if expressType != 0 { + sql = sql + ` a.type = ? ` + param = append(param, expressType) + } + if orderStatus != 0 { + sql = sql + ` a.order_status = ? ` + param = append(param, orderStatus) + } + sql = sql + ` ORDER BY a.create_at DESC LIMIT ? OFFSET ? ` + pageSize = jxutils.FormalizePageSize(pageSize) + param = append(param, pageSize, (pageNum-1)*pageSize) + }