1
This commit is contained in:
@@ -36,7 +36,7 @@ type Bill struct {
|
||||
5)商家公司授权开通日账单接口的证明。(点击下载授权证明模板,授权证明以附件形式提供。)*/
|
||||
func (a *API) GetStoreBillList(param *Bill) (map[string]*SettleOrderList, []*BillListData, int64, error) {
|
||||
// 门店订单结算信息(配送费和定时保险费)
|
||||
orderSettle := make(map[string]*SettleOrderList, 0)
|
||||
//orderSettle := make(map[string]*SettleOrderList, 0)
|
||||
// 门店订单的结算id
|
||||
var settleID int64 = 0
|
||||
// 罚款类目
|
||||
@@ -57,18 +57,18 @@ func (a *API) GetStoreBillList(param *Bill) (map[string]*SettleOrderList, []*Bil
|
||||
settleID = utils.Str2Int64(data.Data[i].SettleSettingId)
|
||||
}
|
||||
|
||||
settle, ok := orderSettle[data.Data[i].WmOrderViewId]
|
||||
if !ok {
|
||||
settle = &SettleOrderList{OrderId: data.Data[i].WmOrderViewId}
|
||||
}
|
||||
//settle, ok := orderSettle[data.Data[i].WmOrderViewId]
|
||||
//if !ok {
|
||||
// settle = &SettleOrderList{OrderId: data.Data[i].WmOrderViewId}
|
||||
//}
|
||||
switch data.Data[i].BillChargeType {
|
||||
case BillChargeTypeOrder: // 平台结算
|
||||
settle.PlatformSettlement = data.Data[i].SettleAmount
|
||||
case BillChargeTypeWayBillFee: // 运费
|
||||
settle.DeliveryFee = data.Data[i].SettleAmount
|
||||
case BillChargeTypeTimingFee: // 定时宝
|
||||
settle.TimingFee = data.Data[i].SettleAmount
|
||||
case 110, 117, 137, 168, 172, 173, 21:
|
||||
//case BillChargeTypeOrder: // 平台结算
|
||||
// settle.PlatformSettlement = data.Data[i].SettleAmount
|
||||
//case BillChargeTypeWayBillFee: // 运费
|
||||
// settle.DeliveryFee = data.Data[i].SettleAmount
|
||||
//case BillChargeTypeTimingFee: // 定时宝
|
||||
// settle.TimingFee = data.Data[i].SettleAmount
|
||||
case 110, 117, 137, 168, 172, 173:
|
||||
//"110": "违约金",
|
||||
//"117": "聚合配送商罚款",
|
||||
//"137": "风控扣款",
|
||||
@@ -80,7 +80,7 @@ func (a *API) GetStoreBillList(param *Bill) (map[string]*SettleOrderList, []*Bil
|
||||
default:
|
||||
continue
|
||||
}
|
||||
orderSettle[data.Data[i].WmOrderViewId] = settle
|
||||
//orderSettle[data.Data[i].WmOrderViewId] = settle
|
||||
}
|
||||
|
||||
if int64(data.ExtraInfo.TotalCount) >= (param.Offset * param.Limit) {
|
||||
@@ -90,7 +90,7 @@ func (a *API) GetStoreBillList(param *Bill) (map[string]*SettleOrderList, []*Bil
|
||||
}
|
||||
}
|
||||
|
||||
return orderSettle, fineList, settleID, nil
|
||||
return nil, fineList, settleID, nil
|
||||
}
|
||||
|
||||
// StoreBillListReq 门店结算查询条件
|
||||
|
||||
Reference in New Issue
Block a user