aa

business/jxcallback/scheduler/basesch/basesch_ext.go

@@ -235,16 +235,11 @@ func (c *BaseScheduler) AgreeOrRefuseRefund(ctx *jxcontext.Context, afsOrderID s
 						}
 						//如果售后退款的商品数等于订单商品数，我就当是全部退款了
 						if afsCount == orderCount {
-							for _, v := range waybills {
-								if err = c.CancelWaybill(v, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive); err == nil {
-									v.DeliveryFlag |= model.WaybillDeliveryFlagMaskActiveCancel
-									_, err = dao.UpdateEntity(db, v, "Status", "DeliveryFlag")
-								} else {
-									globals.SugarLogger.Debugf("AgreeOrRefuseRefund, cancelwaybill error: %v", err)
-								}
-							}
 							order.DeliveryFlag |= model.OrderDeliveryFlagMaskScheduleDisabled
 							partner.CurOrderManager.UpdateOrderFields(order, []string{"DeliveryFlag"})
+							for _, v := range waybills {
+								c.CancelWaybill(v, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive)
+							}
 						}
 					}
 					if order.EarningType == model.EarningTypePoints {