1
This commit is contained in:
@@ -52,22 +52,22 @@ func (a *API) GetStoreBillList(param *Bill) (map[string]*SettleOrderList, []*Bil
|
||||
return nil, nil, 0, err
|
||||
}
|
||||
|
||||
for _, v := range data.Data {
|
||||
for i := 0; i < len(data.Data); i++ {
|
||||
if settleID == 0 {
|
||||
settleID = utils.Str2Int64(v.SettleSettingId)
|
||||
settleID = utils.Str2Int64(data.Data[i].SettleSettingId)
|
||||
}
|
||||
|
||||
settle, ok := orderSettle[v.WmOrderViewId]
|
||||
settle, ok := orderSettle[data.Data[i].WmOrderViewId]
|
||||
if !ok {
|
||||
settle = &SettleOrderList{OrderId: v.WmOrderViewId}
|
||||
settle = &SettleOrderList{OrderId: data.Data[i].WmOrderViewId}
|
||||
}
|
||||
switch v.BillChargeType {
|
||||
switch data.Data[i].BillChargeType {
|
||||
case BillChargeTypeOrder: // 平台结算
|
||||
settle.PlatformSettlement = v.SettleAmount
|
||||
settle.PlatformSettlement = data.Data[i].SettleAmount
|
||||
case BillChargeTypeWayBillFee: // 运费
|
||||
settle.DeliveryFee = v.SettleAmount
|
||||
settle.DeliveryFee = data.Data[i].SettleAmount
|
||||
case BillChargeTypeTimingFee: // 定时宝
|
||||
settle.TimingFee = v.SettleAmount
|
||||
settle.TimingFee = data.Data[i].SettleAmount
|
||||
case 110, 117, 137, 168, 172, 173, 21:
|
||||
//"110": "违约金",
|
||||
//"117": "聚合配送商罚款",
|
||||
@@ -76,11 +76,11 @@ func (a *API) GetStoreBillList(param *Bill) (map[string]*SettleOrderList, []*Bil
|
||||
//"172": "订单取消跑腿罚款",
|
||||
//"173": "订单取消跑腿罚款退款",
|
||||
//"21": "推广账户充值",
|
||||
fineList = append(fineList, &v)
|
||||
fineList = append(fineList, &data.Data[i])
|
||||
default:
|
||||
continue
|
||||
}
|
||||
orderSettle[v.WmOrderViewId] = settle
|
||||
orderSettle[data.Data[i].WmOrderViewId] = settle
|
||||
}
|
||||
|
||||
if int64(data.ExtraInfo.TotalCount) >= (param.Offset * param.Limit) {
|
||||
|
||||
Reference in New Issue
Block a user