大屏轮胎品牌销量、销售尺寸接口修改

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/mapper/GoodsDescMapper.java

@@ -47,4 +47,14 @@ public interface GoodsDescMapper extends BaseMapper<PjGoodsDesc> {
 
 	@TenantIgnore
 	List<PjGoodsDesc> selectListGoods(@Param("goodsNo") String goodsNo, @Param("tenantId") String tenantId);
+
+
+	/**
+	 * 根据商品编码查询商品信息
+	 *
+	 * @param tenantId 租户id
+	 * @param goodsIds 商品id
+	 * @return 结果
+	 */
+	List<PjGoodsDesc> selectGoodsListBySaleSizeDetail(@Param("tenantId") String tenantId, @Param("goodsIds") List<Long> goodsIds);
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/mapper/GoodsDescMapper.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.goods.mapper.GoodsDescMapper">
 
     <!-- 通用查询映射结果 -->
@@ -55,5 +56,18 @@
           and tenant_id = #{tenantId}
           and find_in_set(code, #{goodsNo})
     </select>
+    <select id="selectGoodsListBySaleSizeDetail" resultType="org.springblade.salesPart.entity.PjGoodsDesc">
+        select *
+        from pjpf_goods_desc
+        where is_deleted = 0
+        and enable_or_not = 1
+        and tenant_id = #{tenantId}
+        <if test="goodsIds != null and goodsIds.size > 0">
+            and id in
+            <foreach collection="goodsIds" item="goodsId" separator="," open="(" close=")">
+                #{goodsId}
+            </foreach>
+        </if>
+    </select>
 
 </mapper>

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/service/IGoodsDescService.java

@@ -97,4 +97,13 @@ public interface IGoodsDescService extends IService<PjGoodsDesc> {
     List<PjGoodsDesc> selectGoodsList(String tenantId, String goodsIds);
 
 	R importDescPoints(List<GoodsPointsExcel> excelList, boolean b);
+
+	/**
+	 * 根据商品编码查询商品信息
+	 *
+	 * @param tenantId 租户id
+	 * @param goodsIds 商品id
+	 * @return 结果
+	 */
+	List<PjGoodsDesc> selectGoodsListBySaleSizeDetail(String tenantId, List<Long> goodsIds);
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/service/impl/GoodsDescServiceImpl.java

@@ -809,6 +809,11 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, PjGoodsDe
 		return R.success("导入成功，请及时同步商品信息");
 	}
 
+	@Override
+	public List<PjGoodsDesc> selectGoodsListBySaleSizeDetail(String tenantId, List<Long> goodsIds) {
+		return baseMapper.selectGoodsListBySaleSizeDetail(tenantId, goodsIds);
+	}
+
 	/**
 	 * 校验商品唯一性
 	 *

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

@@ -756,19 +756,20 @@ public class ApiServiceImpl implements ApiService {
 
 	@Override
 	public List<Map<String, Object>> tyreSaleSizeProportion(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<>();
 			List<Long> goodsId = orderItemsList.stream().map(PjOrderItems::getGoodsId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
-			StringBuilder goodsIds = new StringBuilder();
+/*			StringBuilder goodsIds = new StringBuilder();
 			for (Long item : goodsId) {
 				goodsIds.append(item).append(",");
 			}
 			if (ObjectUtils.isNotNull(goodsIds.toString())) {
 				goodsIds = new StringBuilder(goodsIds.substring(0, goodsIds.length() - 1));
 			}
-			List<PjGoodsDesc> goodsDescList = goodsDescService.selectGoodsList(tenantId, goodsIds.toString());
+			List<PjGoodsDesc> goodsDescList = goodsDescService.selectGoodsList(tenantId, goodsIds.toString());*/
+			List<PjGoodsDesc> goodsDescList = goodsDescService.selectGoodsListBySaleSizeDetail(tenantId, goodsId);
 			for (Long items : goodsId) {
 				BigDecimal goodsNum = orderItemsList.stream().filter(e -> e.getGoodsId().equals(items)).map(PjOrderItems::getGoodsNum)
 					.reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -842,14 +843,15 @@ public class ApiServiceImpl implements ApiService {
 		if (!orderItemsList.isEmpty()) {
 			List<TyreSaleSize> saleSizeList = new ArrayList<>();
 			List<Long> goodsId = orderItemsList.stream().map(PjOrderItems::getGoodsId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
-			StringBuilder goodsIds = new StringBuilder();
+/*			StringBuilder goodsIds = new StringBuilder();
 			for (Long item : goodsId) {
 				goodsIds.append(item).append(",");
 			}
 			if (ObjectUtils.isNotNull(goodsIds.toString())) {
 				goodsIds = new StringBuilder(goodsIds.substring(0, goodsIds.length() - 1));
-			}
-			List<PjGoodsDesc> goodsDescList = goodsDescService.selectGoodsList(tenantId, goodsIds.toString());
+			}*/
+			// List<PjGoodsDesc> goodsDescList = goodsDescService.selectGoodsList(tenantId, goodsIds.toString());
+			List<PjGoodsDesc> goodsDescList = goodsDescService.selectGoodsListBySaleSizeDetail(tenantId, goodsId);
 			for (Long items : goodsId) {
 				BigDecimal goodsNum = orderItemsList.stream().filter(e -> e.getGoodsId().equals(items)).map(PjOrderItems::getGoodsNum)
 					.reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -935,7 +937,8 @@ public class ApiServiceImpl implements ApiService {
 
 	@Override
 	public List<Map<String, Object>> tyreBrandSalesVolumeProportion(String tenantId) {
-		List<PjOrderItems> orderItemsList = orderItemsService.selectOrderItemsList(tenantId, "");
+		// List<PjOrderItems> orderItemsList = orderItemsService.selectOrderItemsList(tenantId, "");
+		List<PjOrderItems> orderItemsList = orderItemsService.selectOrderItemsListBySaleSizeDetail(tenantId);
 		List<Map<String, Object>> mapList = new ArrayList<>();
 		if (!orderItemsList.isEmpty()) {
 			List<TyreSaleBrand> saleBrandList = new ArrayList<>();
@@ -969,7 +972,8 @@ public class ApiServiceImpl implements ApiService {
 
 	@Override
 	public List<Map<String, Object>> tyreBrandSalesVolumeDetail(String tenantId) {
-		List<PjOrderItems> orderItemsList = orderItemsService.selectOrderItemsList(tenantId, "");
+		// List<PjOrderItems> orderItemsList = orderItemsService.selectOrderItemsList(tenantId, "");
+		List<PjOrderItems> orderItemsList = orderItemsService.selectOrderItemsListBySaleSizeDetail(tenantId);
 		List<Map<String, Object>> mapList = new ArrayList<>();
 		if (!orderItemsList.isEmpty()) {
 			List<TyreSaleBrand> saleBrandList = new ArrayList<>();