...
|
...
|
@@ -793,7 +793,7 @@ func (service OrderInfoService) PageListOrderBonus(listOrderQuery query.ListOrde |
|
|
return orders, cnt, nil
|
|
|
}
|
|
|
|
|
|
//GetOrderBestshopInfo 获取来源于海鲜干货订单的详情以及分红数据
|
|
|
//GetOrderBestshopInfo 获取来源于xiangmi订单的详情以及分红数据
|
|
|
func (service OrderInfoService) GetOrderBestshopInfoWithBonus(orderBaseId int64, companyId int64) (interface{}, error) {
|
|
|
var (
|
|
|
transactionContext, _ = factory.CreateTransactionContext(nil)
|
...
|
...
|
@@ -877,12 +877,12 @@ func (service OrderInfoService) GetOrderBestshopInfoWithBonus(orderBaseId int64, |
|
|
orderData.PartnerInfo = partnerInfo.Partner
|
|
|
orderBestshopData, err = orderBestshopRepository.FindOne(domain.OrderBestshopFindOneQuery{OrderId: orderData.DataFrom.DataId})
|
|
|
if err != nil {
|
|
|
e := fmt.Sprintf("获取海鲜干货订单(order_bestshop)数据失败,id=%d,err=%s", orderData.DataFrom.DataId, err)
|
|
|
e := fmt.Sprintf("获取xiangmi订单(order_bestshop)数据失败,id=%d,err=%s", orderData.DataFrom.DataId, err)
|
|
|
return nil, lib.ThrowError(lib.INTERNAL_SERVER_ERROR, e)
|
|
|
}
|
|
|
orderGoodBestshop, err = orderGoodBestshopRepository.Find(domain.OrderGoodBestshopFindQuery{OrderId: orderBestshopData.Id})
|
|
|
if err != nil {
|
|
|
e := fmt.Sprintf("获取海鲜干货订单货品(order_good_bestshop)数据失败,order_id=%d,err=%s", orderBestshopData.Id, err)
|
|
|
e := fmt.Sprintf("获取xiangmi订单货品(order_good_bestshop)数据失败,order_id=%d,err=%s", orderBestshopData.Id, err)
|
|
|
return nil, lib.ThrowError(lib.INTERNAL_SERVER_ERROR, e)
|
|
|
}
|
|
|
orderBestshopData.Goods = orderGoodBestshop
|
...
|
...
|
|