From 8200a756eacc143c39fee48a87b4c1f25d4c1980 Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 12 Nov 2018 18:00:10 +0800 Subject: [PATCH] - force mtps cancel reason to empty. --- business/jxcallback/orderman/orderman_ext.go | 2 +- business/partner/delivery/mtps/waybill.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index b71170de1..413727f82 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -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 = ?" sqlParams = append(sqlParams, orderType) } - sql += " ORDER BY t1.status_time" + sql += " ORDER BY t1.status_time, t1.order_type DESC" db := dao.GetDB() if err = dao.GetRows(db, &statusList, sql, sqlParams...); err != nil { diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index 4692e30dd..67d95b903 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -282,6 +282,7 @@ func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int, // cancelReasonID = mtpsapi.CancelReasonRideerOther // } cancelReasonID = mtpsapi.CancelReasonMerchantOther + cancelReason = "" _, err = api.MtpsAPI.CancelOrder(utils.Str2Int64(bill.VendorWaybillID2), bill.VendorWaybillID, cancelReasonID, cancelReason) return nil }