蜂鸟加四毛,下载excel违约金加在运费上

business/jxcallback/orderman/orderman_ext.go

@@ -510,6 +510,7 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
 							paramDamages := []interface{}{v.VendorOrderID, model.OrderStatusCanceled}
 							if err := dao.GetRow(dao.GetDB(), damages, sqlDamages, paramDamages); err == nil {
 								v.LiquidatedDamages = damages.Damages
+								v.DesiredFee += damages.Damages
 							}
 							orders2 = append(orders2, v)
 						} else {

business/jxcallback/scheduler/defsch/defsch_ext.go

@@ -500,6 +500,9 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
 									}
 								} else {
 									feeInfo.DeliveryFee += model.WayBillDeliveryMarkUp // 加收两毛
+									if storeCourier.VendorID == model.VendorIDFengNiao {
+										feeInfo.DeliveryFee += model.WayBillDeliveryMarkUp // 蜂鸟加
+									}
 									feeInfo.TimeoutSecond = timeoutSecond
 								}
 							} else {