1

business/jxcallback/orderman/orderman_ext.go

@@ -1201,13 +1201,26 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
 		saleInfoList = append(saleInfoList, v)
 	}
 
+	// 门店服务费
 	feeList, _ := dao.GetStoreServerFee(db, storeIDList, fromTime, toTime, statusList, true)
+	// 门店账号支出
+	fineList, _ := dao.StatisticsFineFee(db, fromTime, toTime, storeIDList)
 	for _, v := range saleInfoList {
 		for _, f := range feeList {
 			if v.StoreID == f.JxStoreID && v.VendorID == f.VendorID {
 				v.ServerFee = f.ServerFee
 			}
 		}
+		for _, vf := range fineList {
+			if v.StoreID == vf.StoreID && v.VendorID == vf.VendorID {
+				switch vf.BillType {
+				case 21:
+					v.PromotionFee += vf.SettleAmount
+				default:
+					v.FineFee += vf.SettleAmount
+				}
+			}
+		}
 	}
 	return saleInfoList, err
 }