1

platformapi/mtwmapi/bill_list.go

@@ -34,27 +34,29 @@ type Bill struct {
 3）想要实现的效果；
 4）预计开发周期和上线时间；
 5）商家公司授权开通日账单接口的证明。（点击下载授权证明模板，授权证明以附件形式提供。）*/
-func (a *API) GetStoreBillList(param *Bill) (map[string]*SettleOrderList, int64, error) {
+func (a *API) GetStoreBillList(param *Bill) (map[string]*SettleOrderList, []*BillListData, int64, error) {
 	// 门店订单结算信息(配送费和定时保险费)
 	orderSettle := make(map[string]*SettleOrderList, 0)
 	// 门店订单的结算id
 	var settleID int64 = 0
+	// 罚款类目
+	fineList := make([]*BillListData, 0, 0)
 	for {
 		result, err := a.AccessAPI3("bill/list", true, utils.Struct2Map(param, "", false))
 		if err != nil {
-			return nil, 0, err
+			return nil, nil, 0, err
 		}
 
 		var data *StoreBillListRes
 		if err := utils.Map2StructByJson(result, &data, false); err != nil {
-			return nil, 0, err
-		}
-
-		if len(data.Data) > 0 && param.Offset == 0 {
-			settleID = utils.Str2Int64(data.Data[0].SettleSettingId)
+			return nil, nil, 0, err
 		}
 
 		for _, v := range data.Data {
+			if settleID == 0 {
+				settleID = utils.Str2Int64(v.SettleSettingId)
+			}
+
 			settle, ok := orderSettle[v.WmOrderViewId]
 			if !ok {
 				settle = &SettleOrderList{OrderId: v.WmOrderViewId}
@@ -66,6 +68,15 @@ func (a *API) GetStoreBillList(param *Bill) (map[string]*SettleOrderList, int64,
 				settle.DeliveryFee = v.SettleAmount
 			case BillChargeTypeTimingFee: // 定时宝
 				settle.TimingFee = v.SettleAmount
+			case 110, 117, 137, 168, 172, 173, 21:
+				//"110": "违约金",
+				//"117": "聚合配送商罚款",
+				//"137": "风控扣款",
+				//"168": "系统服务费",
+				//"172": "订单取消跑腿罚款",
+				//"173": "订单取消跑腿罚款退款",
+				//"21":  "推广账户充值",
+				fineList = append(fineList, &v)
 			default:
 				continue
 			}
@@ -79,7 +90,7 @@ func (a *API) GetStoreBillList(param *Bill) (map[string]*SettleOrderList, int64,
 		}
 	}
 
-	return orderSettle, settleID, nil
+	return orderSettle, fineList, settleID, nil
 }
 
 // StoreBillListReq 门店结算查询条件