统计分析-销售人员提成列表和搜索显示

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/vo/SalesDetailsVo.java

@@ -17,6 +17,8 @@ import java.util.Date;
 @Data
 public class SalesDetailsVo implements Serializable {
 	private static final long serialVersionUID = 1L;
+	//租户id
+	private String tenandId;
 	//销售订单表主键
 	private Long orderId;
 	//销售订单物料明细主键
@@ -59,4 +61,7 @@ public class SalesDetailsVo implements Serializable {
 	//品牌
 	private String brand;
 
+	//尺寸
+	private String specs;
+
 }

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -367,12 +367,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 
 			//=============生成凭证所需信息==============
 			String accountName = select.getBelongCompany();
-			LambdaQueryWrapper<JdTenant> jdTenantLambdaQueryWrapper = new LambdaQueryWrapper<>();
-			jdTenantLambdaQueryWrapper
-				.eq(JdTenant::getIsEnable, 1)
-				.eq(JdTenant::getTenantId, AuthUtil.getTenantId())
-				.eq(JdTenant::getAccountName, accountName);
-			JdTenant jdTenant = jdTenantMapper.selectOne(jdTenantLambdaQueryWrapper);
+			JdTenant jdTenant = getJdTenant(accountName);
 			if(jdTenant != null) {
 				try {
 					//测试账套-收货生成凭证
@@ -597,12 +592,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		//收货凭证
 		if ("681169".equals(select.getTenantId())) {
 			String accountName = select.getBelongCompany();
-			LambdaQueryWrapper<JdTenant> jdTenantLambdaQueryWrapper = new LambdaQueryWrapper<>();
-			jdTenantLambdaQueryWrapper
-				.eq(JdTenant::getIsEnable, 1)
-				.eq(JdTenant::getTenantId, AuthUtil.getTenantId())
-				.eq(JdTenant::getAccountName, accountName);
-			JdTenant jdTenant = jdTenantMapper.selectOne(jdTenantLambdaQueryWrapper);
+			JdTenant jdTenant = getJdTenant(accountName);
 			if(jdTenant != null) {
 				//todo
 				try {
@@ -1567,6 +1557,16 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 
 	}
 
+	private JdTenant getJdTenant(String accountName){
+		LambdaQueryWrapper<JdTenant> jdTenantLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		jdTenantLambdaQueryWrapper
+			.eq(JdTenant::getIsEnable, 1)
+			.eq(JdTenant::getTenantId, AuthUtil.getTenantId())
+			.eq(JdTenant::getAccountName, accountName);
+		JdTenant jdTenant = jdTenantMapper.selectOne(jdTenantLambdaQueryWrapper);
+		return jdTenant;
+	}
+
 	@Data
 	public static class tokenDTO {
 		private Long errcode;

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

@@ -31,6 +31,7 @@ import org.springblade.purchase.sales.entity.OrderItems;
 import org.springblade.purchase.sales.excel.EnquiryExcel;
 import org.springblade.purchase.sales.excel.ExportOrderExcel;
 import org.springblade.purchase.sales.excel.ProfitItemExcel;
+import org.springblade.purchase.sales.excel.SalesDetailsExcel;
 import org.springblade.purchase.sales.service.*;
 import org.springblade.purchase.sales.vo.*;
 import org.springblade.system.user.entity.User;
@@ -656,7 +657,7 @@ public class ExportOrderController extends BladeController {
 	@ApiOperation(value = "统计分析 销售明细", notes = "统计分析 销售明细")
 	public R<IPage<SalesDetailsVo>> selBusinessOrder(SalesDetailsVo detailsVo, Query query)
 	{
-		System.out.println("detailsVo================"+detailsVo);
+		detailsVo.setTenandId(SecureUtil.getTenantId());
 		IPage<SalesDetailsVo> pages = orderService.selBusinessOrder(Condition.getPage(query), detailsVo);
 		return R.data(pages);
 	}
@@ -664,10 +665,25 @@ public class ExportOrderController extends BladeController {
 	/**
 	 * 统计分析 销售明细导出
 	 */
-	/**@GetMapping("/export")
-	@ApiOperation(value = "销售明细导出", notes = "销售明细导出")
-	public void export(SalesDetailsVo detailsVo, Query query, HttpServletResponse response){
-		IPage<SalesDetailsVo> page = orderService.selBusinessOrder(Condition.getPage(query), detailsVo);;
-		//enquiryExcels = JSON.parseArray(JSON.toJSONString(page.getRecords()), EnquiryExcel.class);
-	}*/
+//	@GetMapping("/salesDetailsExport")
+//	@ApiOperation(value = "销售明细导出", notes = "销售明细导出")
+//	public void salesDetailsExport(SalesDetailsVo detailsVo, Query query, HttpServletResponse response){
+//		List<SalesDetailsExcel> enquiryExcels = new ArrayList<>();
+//		List<SalesDetailsVo> list = orderService.salesDetailsExport(detailsVo);;
+//		ExcelUtil.export(response, "销售明细", "销售明细", enquiryExcels, SalesDetailsExcel.class);
+//	}
+
+	/**
+	 * 统计分析 销售人员提成列表和检索条件查询
+	 * @param detailsVo
+	 * @param query
+	 * @return
+	 */
+	@GetMapping("/salesCommission")
+	@ApiOperation(value = "销售人员提成", notes = "销售人员提成")
+	public R<IPage<SalesDetailsVo>> salesCommission(SalesDetailsVo detailsVo,Query query){
+		detailsVo.setTenandId(SecureUtil.getTenantId());
+		IPage<SalesDetailsVo> pages = orderService.salesCommission(Condition.getPage(query), detailsVo);
+		return R.data(pages);
+	}
 }

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

@@ -84,6 +84,11 @@ public interface OrderMapper extends BaseMapper<Order> {
 	List<SalesDetailsVo> selBusinessOrder(IPage<SalesDetailsVo> page,@Param("detailsVo") SalesDetailsVo detailsVo);
 
 	/**
+	 * 统计分析 销售人员提成列表和检索条件查询
+	 */
+	List<SalesDetailsVo> salesCommission(IPage<SalesDetailsVo> page,@Param("detailsVo") SalesDetailsVo detailsVo);
+
+	/**
 	 * 首页获取销售趋势
 	 * @param tenantId 租户id
 	 * @param tradeType 贸易类型

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

@@ -561,6 +561,7 @@ ORDER BY
         LEFT JOIN basic_corps_desc BCD ON BO.Corp_id = BCD.id
         <where>
             BOI.is_deleted = 0
+            AND BO.tenant_id = #{detailsVo.tenandId}
             <if test="detailsVo.corpName != null and detailsVo.corpName != ''">
                 AND BCD.cname like concat('%', #{detailsVo.corpName}, '%')
             </if>
@@ -580,6 +581,38 @@ ORDER BY
         order by BO.create_time desc
     </select>
 
+    <select id="salesCommission" resultType="org.springblade.purchase.sales.vo.SalesDetailsVo">
+        SELECT
+            bo.id as orderId,
+            boi.id as itemsId,
+            bgd.brand as brand,
+            bo.sales_name as salesName,
+            bo.create_time as careteTime,
+            bgd.specs as specs,
+            boi.actual_quantity as quantity
+        FROM business_order bo
+        LEFT JOIN business_order_items boi on boi.pid = bo.id
+        LEFT JOIN basic_goods_desc bgd on bgd.id = boi.item_id
+        <where>
+            bo.bill_type = 'XS'
+            AND bo.is_deleted = 0
+            AND bo.tenant_id = #{detailsVo.tenandId}
+            <if test="detailsVo.brand != null and detailsVo.brand != ''">
+                AND bgd.Brand like concat('%', #{detailsVo.brand}, '%')
+            </if>
+            <if test="detailsVo.salesName != null and detailsVo.salesName != ''">
+                AND bo.Sales_name like concat('%', #{detailsVo.salesName}, '%')
+            </if>
+            <if test="detailsVo.beginCreateTime !=null and detailsVo.beginCreateTime != ''">
+                and bo.create_time >= #{detailsVo.beginCreateTime}
+            </if>
+            <if test="detailsVo.endCreateTime !=null and detailsVo.endCreateTime != ''">
+                and bo.create_time &lt;= #{detailsVo.endCreateTime}
+            </if>
+        </where>
+        order by bo.create_time desc
+    </select>
+
     <select id="monthSales"  resultType="BigDecimal">
         SELECT
         ROUND( IFNULL( SUM( bi.amount * bo.exchange_rate ), 0 ), 2 ) AS a

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

@@ -164,4 +164,15 @@ public interface IOrderService extends IService<Order> {
 	 * 查询 统计分析 销售明细
 	 */
 	IPage<SalesDetailsVo> selBusinessOrder(IPage<SalesDetailsVo> page, SalesDetailsVo detailsVo);
+
+	/**
+	 * 统计分析 销售明细导出
+	 */
+	List<SalesDetailsVo> salesDetailsExport(SalesDetailsVo detailsVo);
+
+	/**
+	 * 统计分析 销售人员提成列表和检索条件查询
+	 */
+	IPage<SalesDetailsVo> salesCommission(IPage<SalesDetailsVo> page, SalesDetailsVo detailsVo);
+
 }

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

@@ -1346,6 +1346,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		return list;
 	}
 
+	/**
+	 * 统计分析 销售人员提成列表和检索条件查询
+	 */
+	@Override
+	public IPage<SalesDetailsVo> salesCommission(IPage<SalesDetailsVo> page, SalesDetailsVo detailsVo) {
+		return page.setRecords(baseMapper.salesCommission(page, detailsVo));
+	}
+
 
 	@Override
 	public MonthSales monthSales(OrderVO order) {