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

- force mtps cancel reason to empty.

Browse Source
This commit is contained in:
gazebo
2018-11-12 18:00:10 +08:00
parent f8f5f77fbf
commit 8200a756ea
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/orderman/orderman_ext.go
View File

@@ -506,7 +506,7 @@ func (c *OrderManager) GetOrderStatusList(ctx *jxcontext.Context, vendorOrderID
sql += " AND t1.vendor_order_id = ? AND t1.vendor_id = ? AND t1.order_type = ?" sql += " AND t1.vendor_order_id = ? AND t1.vendor_id = ? AND t1.order_type = ?"
sqlParams = append(sqlParams, orderType) sqlParams = append(sqlParams, orderType)
} }
sql += " ORDER BY t1.status_time" sql += " ORDER BY t1.status_time, t1.order_type DESC"
db := dao.GetDB() db := dao.GetDB()
if err = dao.GetRows(db, &statusList, sql, sqlParams...); err != nil { if err = dao.GetRows(db, &statusList, sql, sqlParams...); err != nil {

1
business/partner/delivery/mtps/waybill.go
View File

@@ -282,6 +282,7 @@ func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int,
// cancelReasonID = mtpsapi.CancelReasonRideerOther // cancelReasonID = mtpsapi.CancelReasonRideerOther
// } // }
cancelReasonID = mtpsapi.CancelReasonMerchantOther cancelReasonID = mtpsapi.CancelReasonMerchantOther
cancelReason = ""
_, err = api.MtpsAPI.CancelOrder(utils.Str2Int64(bill.VendorWaybillID2), bill.VendorWaybillID, cancelReasonID, cancelReason) _, err = api.MtpsAPI.CancelOrder(utils.Str2Int64(bill.VendorWaybillID2), bill.VendorWaybillID, cancelReasonID, cancelReason)
return nil return nil
} }