liulei/baseapi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2025-09-04 14:10:58 +08:00
parent 1a15fa7452
commit 641329db6d
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
platformapi/mtwmapi/bill_list.go
View File

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