2022年11月3日 18:02

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.java

@@ -250,12 +250,12 @@ public interface OrderMapper extends BaseMapper<Order> {
 	/**
 	 * 业务员利润统计
 	 */
-	List<OrderStatisticsVo> salesmanProfit(IPage<OrderStatisticsVo> page,@Param("statisticsVo") OrderStatisticsVo statisticsVo, @Param("brand") String brand);
+	List<OrderStatisticsVo> salesmanProfit(IPage<OrderStatisticsVo> page,@Param("statisticsVo") OrderStatisticsVo statisticsVo, @Param("brand") String brand, @Param("chargeMember") String chargeMember);
 
 	/**
 	 * 业务员利润导出
 	 */
-	List<SalesmanProfitExcel> salesmanProfitExport(@Param("statisticsVo") OrderStatisticsVo statisticsVo, @Param("brand") String brand);
+	List<SalesmanProfitExcel> salesmanProfitExport(@Param("statisticsVo") OrderStatisticsVo statisticsVo, @Param("brand") String brand, @Param("chargeMember") String chargeMember);
 
 	/**
 	 * 客户利润统计

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -1713,7 +1713,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 */
 	@Override
 	public IPage<OrderStatisticsVo> salesmanProfit(IPage<OrderStatisticsVo> page, OrderStatisticsVo statisticsVo) {
-		return page.setRecords(baseMapper.salesmanProfit(page, statisticsVo, statisticsVo.getBrand()));
+		return page.setRecords(baseMapper.salesmanProfit(page, statisticsVo, statisticsVo.getBrand(), statisticsVo.getChargeMember()));
 	}
 
 	/**
@@ -1721,7 +1721,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 */
 	@Override
 	public List<SalesmanProfitExcel> salesmanProfitExport(OrderStatisticsVo statisticsVo) {
-		return baseMapper.salesmanProfitExport(statisticsVo, statisticsVo.getBrand());
+		return baseMapper.salesmanProfitExport(statisticsVo, statisticsVo.getBrand(), statisticsVo.getChargeMember());
 	}
 
 	/**