Browse Source

新增大屏数据查询接口

liyuan 9 months ago
parent
commit
a87ded74a0

+ 10 - 0
blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/mapper/OrderItemsMapper.java

@@ -74,4 +74,14 @@ public interface OrderItemsMapper extends BaseMapper<PjOrderItems> {
 
 	@TenantIgnore
 	int deleteByIds(@Param("list")List<Long> shareOrderItemsIds);
+
+
+	/**
+	 * 大屏展示查询数据
+	 *
+	 * @param tenantId 租户id
+	 * @return 结果
+	 */
+	@TenantIgnore
+	List<PjOrderItems> selectOrderItemsListBySaleSizeDetail(@Param("tenantId") String tenantId);
 }

+ 20 - 0
blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/mapper/OrderItemsMapper.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--suppress ALL -->
 <mapper namespace="org.springblade.salesPart.order.mapper.OrderItemsMapper">
 
     <!-- 通用查询映射结果 -->
@@ -841,6 +842,25 @@
     <select id="selectShareOrderItems" resultType="org.springblade.salesPart.entity.PjOrderItems">
         select * from pjpf_order_items where is_deleted = 0 and find_in_set(pid , #{ids})
     </select>
+    <select id="selectOrderItemsListBySaleSizeDetail" resultType="org.springblade.salesPart.entity.PjOrderItems"
+            parameterType="java.lang.String">
+        SELECT
+            poi.goods_id,
+            poi.goods_num,
+            poi.returns_number
+        FROM
+            pjpf_order_items poi
+                LEFT JOIN pjpf_order po ON poi.pid = po.id
+        WHERE
+            poi.is_deleted = '0'
+          AND po.is_deleted = '0'
+          AND po.bs_type = 'XS'
+          AND poi.tenant_id = #{tenantId}
+          AND po.tenant_id = #{tenantId}
+          AND po.STATUS IN ( '待确认', '待发货', '已发货', '退款请核', '已取消', '已退款', '售后中', '已收货' )
+
+
+    </select>
 
 
 </mapper>

+ 8 - 0
blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/IOrderItemsService.java

@@ -68,4 +68,12 @@ public interface IOrderItemsService extends IService<PjOrderItems> {
 	List<PjOrderItems> selectShareOrderItems(String ids);
 
 	int deleteByIds(List<Long> shareOrderItemsIds);
+
+	/**
+	 * 大屏展示查询数据
+	 *
+	 * @param tenantId 租户id
+	 * @return 结果
+	 */
+	List<PjOrderItems> selectOrderItemsListBySaleSizeDetail(String tenantId);
 }

+ 6 - 0
blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderItemsServiceImpl.java

@@ -32,6 +32,7 @@ import org.springblade.salesPart.vo.OrderItemsVO;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -135,5 +136,10 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, PjOrder
 		return baseMapper.deleteByIds(shareOrderItemsIds);
 	}
 
+	@Override
+	public List<PjOrderItems> selectOrderItemsListBySaleSizeDetail(String tenantId) {
+		return baseMapper.selectOrderItemsListBySaleSizeDetail(tenantId);
+	}
+
 
 }

+ 1 - 1
blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/smartLargeScreenApi/service/impl/ApiServiceImpl.java

@@ -837,7 +837,7 @@ public class ApiServiceImpl implements ApiService {
 
 	@Override
 	public List<Map<String, Object>> tyreSaleSizeDetail(String tenantId) {
-		List<PjOrderItems> orderItemsList = orderItemsService.selectOrderItemsList(tenantId, "");
+		List<PjOrderItems> orderItemsList = orderItemsService.selectOrderItemsListBySaleSizeDetail(tenantId);
 		List<Map<String, Object>> mapList = new ArrayList<>();
 		if (!orderItemsList.isEmpty()) {
 			List<TyreSaleSize> saleSizeList = new ArrayList<>();