- force mtps cancel reason to empty.

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 {

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
 }