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:
邹宗楠
2023-06-01 12:47:35 +08:00
parent f38c6bcc4b
commit 2433cbd9f3
3 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
business/jxcallback/orderman/waybill.go
View File

@@ -247,25 +247,23 @@ func GetComplaintReasons() (complaintReasonList []*dadaapi.ComplaintReason) {
return complaintReasonList return complaintReasonList
} }
func ComplaintRider(ctx *jxcontext.Context, vendorOrderID string, vendorID, waybillVendorID, complaintID int) (err error) { func ComplaintRider(ctx *jxcontext.Context, vendorOrderID string, vendorWaybillId string, complaintID int) (err error) {
db := dao.GetDB() wayBillList, err := dao.GetComplaintList(dao.GetDB(), vendorOrderID, vendorWaybillId)
p := partner.GetDeliveryPlatformFromVendorID(waybillVendorID).Handler if err != nil {
wayBillList, err := dao.GetWayBillByOrderID(db, 0, vendorID, waybillVendorID, vendorOrderID) return err
}
if len(wayBillList) != model.YES {
return fmt.Errorf("订单所属运单不存在,或运单为分配骑手,无法投诉")
}
p := partner.GetDeliveryPlatformFromVendorID(wayBillList[0].WaybillVendorID).Handler
if err == nil && len(wayBillList) > 0 { if err == nil && len(wayBillList) > 0 {
err = p.ComplaintRider(wayBillList[0], complaintID, complaintReasonsMap[complaintID]) err = p.ComplaintRider(wayBillList[0], complaintID, complaintReasonsMap[complaintID])
} else {
return fmt.Errorf("未查询到到相关订单！订单号：[%v] ,厂商：[%v]，运送厂商：[%v]", vendorOrderID, vendorID, waybillVendorID)
} }
return err return err
} }
// GetComplaintList 获取投诉列表 // GetComplaintList 获取投诉列表
func GetComplaintList(orderId string) ([]*model.Waybill, error) { func GetComplaintList(orderId string) ([]*model.Waybill, error) {
return dao.GetComplaintList(dao.GetDB(), orderId) return dao.GetComplaintList(dao.GetDB(), orderId, "")
}
func ComplaintRiderPlatform(ctx *jxcontext.Context, vendorOrderID string, vendorID, waybillVendorID, complaintID int) (err error) {
return fmt.Errorf("只支持三方配送投诉！")
//handler := partner.GetPurchaseOrderHandlerFromVendorID(vendorID)
//return handler.ComplaintRider(vendorOrderID, complaintID, "")
} }

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

@@ -1291,10 +1291,20 @@ func GetWayBillByOrderID(db *DaoDB, orderStatus, vendorID, waybillVendorID int,
return wayBillList, err return wayBillList, err
} }
func GetComplaintList(db *DaoDB, orderId string) ([]*model.Waybill, error) { func GetComplaintList(db *DaoDB, orderId string, vendorWaybillId string) ([]*model.Waybill, error) {
sql := ` SELECT * FROM waybill WHERE vendor_order_id = ? AND courier_name <> '' AND courier_mobile <> '' ` sql := ` SELECT * FROM waybill WHERE vendor_order_id = ? `
var param []interface{}
param = append(param, orderId)
if vendorWaybillId != "" {
sql += ` AND vendor_waybill_id = ? `
param = append(param, vendorWaybillId)
}
sql += ` AND waybill_vendor_id IN (?,?,?) AND courier_name <> '' AND courier_mobile <> '' ORDER BY waybill_created_at `
param = append(param, model.VendorIDFengNiao, model.VendorIDDada, model.VendorIDMTPS)
var data []*model.Waybill var data []*model.Waybill
if err := GetRows(db, &data, sql, []interface{}{orderId}); err != nil { if err := GetRows(db, &data, sql, param...); err != nil {
return nil, err return nil, err
} }
return data, nil return data, nil

9
controllers/jx_order.go
View File

@@ -987,19 +987,14 @@ func (c *OrderController) GetComplaintReasons() {
// @Description 投诉骑手 // @Description 投诉骑手
// @Param token header string true "认证token" // @Param token header string true "认证token"
// @Param vendorOrderID formData string true "订单ID" // @Param vendorOrderID formData string true "订单ID"
// @Param vendorID formData int true "订单所属厂商ID" // @Param waybillVendorID formData string true "运单所属厂商ID"
// @Param waybillVendorID formData int true "运单所属厂商ID"
// @Param complaintID formData int true "投诉原因ID" // @Param complaintID formData int true "投诉原因ID"
// @Success 200 {object} controllers.CallResult // @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult
// @router /ComplaintRider [post] // @router /ComplaintRider [post]
func (c *OrderController) ComplaintRider() { func (c *OrderController) ComplaintRider() {
c.callComplaintRider(func(params *tOrderComplaintRiderParams) (retVal interface{}, errCode string, err error) { c.callComplaintRider(func(params *tOrderComplaintRiderParams) (retVal interface{}, errCode string, err error) {
if params.WaybillVendorID > 100 { err = orderman.ComplaintRider(params.Ctx, params.VendorOrderID, params.WaybillVendorID, params.ComplaintID)
err = orderman.ComplaintRider(params.Ctx, params.VendorOrderID, params.VendorID, params.WaybillVendorID, params.ComplaintID)
} else {
err = orderman.ComplaintRiderPlatform(params.Ctx, params.VendorOrderID, params.VendorID, params.WaybillVendorID, params.ComplaintID)
}
return retVal, "", err return retVal, "", err
}) })
} }