添加退款订单打印以及退单打印

business/partner/delivery/dada/waybill.go

@@ -95,7 +95,7 @@ func (c *DeliveryHandler) onWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaap
 		order.Status = model.WaybillStatusUnknown
 	}
 	err := dadaapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), utils.Int2Str(order.Status))
- 	defer  delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID) // 骑手位置更新
+	defer delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID) // 骑手位置更新
 	return err
 }
 
@@ -120,6 +120,12 @@ func (c *DeliveryHandler) callbackMsg2Waybill(msg *dadaapi.CallbackMsg) (retVal
 }
 
 func StoreDetail2ShopInfo(storeDetail *dao.StoreDetail2) (shopInfo *dadaapi.ShopInfo) {
+	// 获取品牌名称
+	brandInfo, err := dao.GetBrands(dao.GetDB(), "", storeDetail.BrandID, "", false, "")
+	if err != nil {
+		return nil
+	}
+
 	lng := jxutils.IntCoordinate2Standard(storeDetail.Lng)
 	lat := jxutils.IntCoordinate2Standard(storeDetail.Lat)
 	cityName := storeDetail.CityName
@@ -135,7 +141,7 @@ func StoreDetail2ShopInfo(storeDetail *dao.StoreDetail2) (shopInfo *dadaapi.Shop
 	}
 	shopInfo = &dadaapi.ShopInfo{
 		OriginShopID:   storeDetail.VendorStoreID,
-		StationName:    globals.StoreName + "-" + storeDetail.Name,
+		StationName:    brandInfo[0].Name + "-" + storeDetail.Name,
 		Business:       dadaapi.BusinessTypeConvStore, // 故意设置成这个的
 		CityName:       cityName,
 		AreaName:       districtName,