取消订单退费

business/jxcallback/scheduler/basesch/basesch_ext.go

@@ -2,6 +2,7 @@ package basesch
 
 import (
 	"fmt"
+	"git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
 	"git.rosy.net.cn/jx-callback/business/jxutils/netprinter"
 	"strings"
 	"time"
@@ -200,9 +201,16 @@ func (c *BaseScheduler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *model
 
 func (c *BaseScheduler) CancelWaybillByID(ctx *jxcontext.Context, vendorWaybillID string, waybillVendorID int, cancelReasonID int, cancelReason string) (err error) {
 	bill, err := partner.CurOrderManager.LoadWaybill(vendorWaybillID, waybillVendorID)
-	if err == nil {
-		err = c.CancelWaybill(bill, cancelReasonID, cancelReason)
+	if err != nil {
+		return err
 	}
+
+	if err := c.CancelWaybill(bill, cancelReasonID, cancelReason); err != nil {
+		return err
+	}
+	order, err := partner.CurOrderManager.LoadOrder(bill.VendorOrderID, bill.OrderVendorID)
+	orderman.ResetCreateWaybillFee(dao.GetDB(), order)
+
 	return err
 }