销售明细导出

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportOrderController.java

@@ -666,6 +666,7 @@ public class ExportOrderController extends BladeController {
 	@ApiOperation(value = "销售明细导出", notes = "销售明细导出")
 	public void salesDetailsExport(SalesDetailsVo detailsVo, Query query, HttpServletResponse response){
 		detailsVo.setTenantId(SecureUtil.getTenantId());
+		System.out.println(SecureUtil.getTenantId());
 		List<SalesDetailsExcel> list = orderService.salesDetailsExport(detailsVo);
 		ExcelUtil.export(response, "销售明细", "销售明细", list, SalesDetailsExcel.class);
 	}
@@ -696,4 +697,44 @@ public class ExportOrderController extends BladeController {
 		List<SalesCommissionExcel> list = orderService.salesCommissionList(detailsVo);
 		ExcelUtil.export(response, "销售人员提成", "销售人员提成", list, SalesCommissionExcel.class);
 	}
+
+	/**
+	 * 统计分析 包装费对账列表和检索条件查询
+	 * @param detailsVo
+	 * @param query
+	 * @return
+	 */
+	@GetMapping("/selPackingFee")
+	@ApiOperation(value = "包装费对账", notes = "传入detailsVo")
+	public R<IPage<SalesDetailsVo>> selPackingFee(SalesDetailsVo detailsVo,Query query){
+		detailsVo.setTenantId(SecureUtil.getTenantId());
+		IPage<SalesDetailsVo> pages = orderService.selPackingFee(Condition.getPage(query), detailsVo);
+		return R.data(pages);
+	}
+
+	/**
+	 * 统计分析 包装费用列表导出
+	 * @param detailsVo
+	 * @return
+	 */
+	@GetMapping("/selPackingFeeExport")
+	@ApiOperation(value = "包装费用对账导出", notes = "包装费用对账导出")
+	public void selPackingFeeExport(SalesDetailsVo detailsVo, HttpServletResponse response){
+		detailsVo.setTenantId(SecureUtil.getTenantId());
+		List<PackingFeeExcel> list = orderService.selPackingFeeExport(detailsVo);
+		ExcelUtil.export(response, "包装费用对账", "包装费用对账", list, PackingFeeExcel.class);
+	}
+
+	/**
+	 * 统计分析 销售利润
+	 * @param
+	 * @return
+	 */
+	@GetMapping("/selSalesProfit")
+	@ApiOperation(value = "统计分析 销售利润", notes = "传入detailsVo")
+	public R<IPage<SalesDetailsVo>> selSalesProfit(SalesDetailsVo detailsVo,Query query){
+		detailsVo.setTenantId(SecureUtil.getTenantId());
+		IPage<SalesDetailsVo> pages = orderService.selSalesProfit(Condition.getPage(query), detailsVo);
+		return R.data(pages);
+	}
 }

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

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.core.tool.api.R;
 import org.springblade.purchase.sales.entity.Order;
+import org.springblade.purchase.sales.excel.PackingFeeExcel;
 import org.springblade.purchase.sales.excel.SalesCommissionExcel;
 import org.springblade.purchase.sales.excel.SalesDetailsExcel;
 import org.springblade.purchase.sales.vo.*;
@@ -182,4 +183,20 @@ public interface IOrderService extends IService<Order> {
 	 */
 	List<SalesCommissionExcel> salesCommissionList(SalesDetailsVo detailsVo);
 
+	/**
+	 * 统计分析 包装费对账列表和检索条件查询
+	 */
+	IPage<SalesDetailsVo> selPackingFee(IPage<SalesDetailsVo> page, SalesDetailsVo detailsVo);
+
+	/**
+	 * 统计分析 包装费对账导出
+	 */
+	List<PackingFeeExcel> selPackingFeeExport(SalesDetailsVo detailsVo);
+
+
+	/**
+	 * 统计分析 销售利润
+	 */
+	IPage<SalesDetailsVo> selSalesProfit(IPage<SalesDetailsVo> page,SalesDetailsVo detailsVo);
+
 }

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

@@ -48,6 +48,7 @@ import org.springblade.finance.feign.IFinanceClient;
 import org.springblade.finance.vojo.Items;
 import org.springblade.purchase.sales.entity.*;
 import org.springblade.purchase.sales.enums.OrderStatusEnum;
+import org.springblade.purchase.sales.excel.PackingFeeExcel;
 import org.springblade.purchase.sales.excel.SalesCommissionExcel;
 import org.springblade.purchase.sales.excel.SalesDetailsExcel;
 import org.springblade.purchase.sales.mapper.OrderFeesMapper;
@@ -1365,6 +1366,30 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		return baseMapper.salesCommissionList(detailsVo);
 	}
 
+	/**
+	 * 统计分析 包装费对账列表和检索条件查询
+	 */
+	@Override
+	public IPage<SalesDetailsVo> selPackingFee(IPage<SalesDetailsVo> page, SalesDetailsVo detailsVo) {
+		return page.setRecords(baseMapper.selPackingFee(page, detailsVo));
+	}
+
+	/**
+	 * 统计分析 销售人员提成列表导出
+	 */
+	@Override
+	public List<PackingFeeExcel> selPackingFeeExport(SalesDetailsVo detailsVo) {
+		return baseMapper.selPackingFeeList(detailsVo);
+	}
+
+	/**
+	 * 统计分析 销售利润
+	 */
+	@Override
+	public IPage<SalesDetailsVo> selSalesProfit(IPage<SalesDetailsVo> page, SalesDetailsVo detailsVo) {
+		return null;
+	}
+
 
 	@Override
 	public MonthSales monthSales(OrderVO order) {