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

1

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

19
business/q_bida/q_bida_server.go
View File

@@ -225,21 +225,24 @@ func QueryOrderDetail(typeCode int, orderNo string) (*bida.OrderDetail, error) {
} }
// QueryUserOrderList 查询用户订单列表 // 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 := ` sql := `
SELECT　 SELECT a.type,a.other_way_bill,a.local_way_bill,a.user_id,a.receive_address_id,a.sender_address_id,
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,
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
district.name sender_address,city.name receive_address
FROM user_vendor_order a 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 user_delivery_address add2 ON a.receive_address_id = add2.id
LEFT JOIN place district ON district.code = add.district_code LEFT JOIN place district ON district.code = add1.city_code
LEFT JOIN place city ON city.code = add2.district_code LEFT JOIN place city ON city.code = add2.city_code
WHERE a.user_id = ? WHERE a.user_id = ?
` `
param := make([]interface{}, 0, 0) param := make([]interface{}, 0, 0)
param = append(param, userId) 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 { if expressType != 0 {
sql = sql + ` a.type = ? ` sql = sql + ` a.type = ? `
param = append(param, expressType) param = append(param, expressType)

3
controllers/q_bida.go
View File

@@ -164,6 +164,7 @@ func (c *QBiDaExpressController) CancelWayVendorOrder() {
// @Param token header string true "管理员token" // @Param token header string true "管理员token"
// @Param expressType formData int false "就是type快递公司" // @Param expressType formData int false "就是type快递公司"
// @Param orderStatus formData int false "订单状态" // @Param orderStatus formData int false "订单状态"
// @Param orderNo formData string false "订单号码"
// @Param pageNum formData int true "页码" // @Param pageNum formData int true "页码"
// @Param pageSize formData int true "页数" // @Param pageSize formData int true "页数"
// @Success 200 {object} controllers.CallResult // @Success 200 {object} controllers.CallResult
@@ -171,7 +172,7 @@ func (c *QBiDaExpressController) CancelWayVendorOrder() {
// @router /QueryUserOrderList [post] // @router /QueryUserOrderList [post]
func (c *QBiDaExpressController) QueryUserOrderList() { func (c *QBiDaExpressController) QueryUserOrderList() {
c.callQueryUserOrderList(func(params *tExpressQueryUserOrderListParams) (interface{}, string, error) { c.callQueryUserOrderList(func(params *tExpressQueryUserOrderListParams) (interface{}, string, error) {
result, err := bidaServer.QueryUserOrderList(params.Ctx.GetUserID(), params.ExpressType, params.OrderStatus, params.PageNum, params.PageSize) result, err := bidaServer.QueryUserOrderList(params.Ctx.GetUserID(), params.ExpressType, params.OrderStatus, params.PageNum, params.PageSize, params.OrderNo)
if err != nil { if err != nil {
return nil, "", err return nil, "", err
} }