交易市场平台（供应商）

baqing-admin/src/main/java/com/ruoyi/web/modules/screen/domain/vo/MallCategorySalesVo.java

@@ -6,20 +6,20 @@ import java.util.List;
 /** 农资品类销售（对接商城 Open API categorySales） */
 public class MallCategorySalesVo
 {
-    private String statDate;
+    private int statYear;
 
     private long totalQty;
 
     private List<MallCategorySalesItemVo> items = new ArrayList<>();
 
-    public String getStatDate()
+    public int getStatYear()
     {
-        return statDate;
+        return statYear;
     }
 
-    public void setStatDate(String statDate)
+    public void setStatYear(int statYear)
     {
-        this.statDate = statDate;
+        this.statYear = statYear;
     }
 
     public long getTotalQty()

baqing-admin/src/main/java/com/ruoyi/web/modules/screen/domain/vo/MallHotCategoryRankVo.java

@@ -6,18 +6,18 @@ import java.util.List;
 /** 热销农资 Top5（对接商城 Open API hotCategoryRank） */
 public class MallHotCategoryRankVo
 {
-    private String statDate;
+    private int statYear;
 
     private List<MallHotCategoryRankItemVo> items = new ArrayList<>();
 
-    public String getStatDate()
+    public int getStatYear()
     {
-        return statDate;
+        return statYear;
     }
 
-    public void setStatDate(String statDate)
+    public void setStatYear(int statYear)
     {
-        this.statDate = statDate;
+        this.statYear = statYear;
     }
 
     public List<MallHotCategoryRankItemVo> getItems()

baqing-admin/src/main/java/com/ruoyi/web/modules/screen/mallstats/MallStatsOpenApiClient.java

@@ -9,6 +9,8 @@ public interface MallStatsOpenApiClient
 {
     /**
      * 拉取商城统计 overview；未启用、配置缺失或调用失败时返回 {@code null}（不抛异常）。
+     *
+     * @param statYear 统计年，对应商城 Open API 查询参数 {@code statYear}
      */
-    MallStatsOverviewVo fetchOverview(String statDate, int statYear);
+    MallStatsOverviewVo fetchOverview(int statYear);
 }

baqing-admin/src/main/java/com/ruoyi/web/modules/screen/mallstats/MallStatsOpenApiClientImpl.java

@@ -52,14 +52,13 @@ public class MallStatsOpenApiClientImpl implements MallStatsOpenApiClient
     }
 
     @Override
-    public MallStatsOverviewVo fetchOverview(String statDate, int statYear)
+    public MallStatsOverviewVo fetchOverview(int statYear)
     {
         if (!properties.isEnabled() || StringUtils.isEmpty(properties.getBaseUrl()))
         {
             return null;
         }
-        String dateKey = StringUtils.isNotEmpty(statDate) ? statDate.trim() : "today";
-        String cacheKey = CACHE_KEY_PREFIX + dateKey + ":" + statYear;
+        String cacheKey = CACHE_KEY_PREFIX + statYear;
         MallStatsOverviewVo cached = redisCache.getCacheObject(cacheKey);
         if (cached != null)
         {
@@ -67,7 +66,7 @@ public class MallStatsOpenApiClientImpl implements MallStatsOpenApiClient
         }
         try
         {
-            MallStatsOverviewVo overview = requestOverview(statDate, statYear);
+            MallStatsOverviewVo overview = requestOverview(statYear);
             if (overview != null)
             {
                 int ttl = Math.max(1, properties.getCacheTtlMinutes());
@@ -77,21 +76,18 @@ public class MallStatsOpenApiClientImpl implements MallStatsOpenApiClient
         }
         catch (Exception ex)
         {
-            log.warn("拉取商城统计 overview 失败 statDate={} statYear={}: {}", statDate, statYear, ex.getMessage());
+            log.warn("拉取商城统计 overview 失败 statYear={}: {}", statYear, ex.getMessage());
             return null;
         }
     }
 
-    private MallStatsOverviewVo requestOverview(String statDate, int statYear) throws Exception
+    private MallStatsOverviewVo requestOverview(int statYear) throws Exception
     {
         String base = trimTrailingSlash(properties.getBaseUrl());
-        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(base + "/api/open/stats/overview")
-                .queryParam("statYear", statYear);
-        if (StringUtils.isNotEmpty(statDate))
-        {
-            builder.queryParam("statDate", statDate.trim());
-        }
-        URI uri = builder.build(true).toUri();
+        URI uri = UriComponentsBuilder.fromHttpUrl(base + "/api/open/stats/overview")
+                .queryParam("statYear", statYear)
+                .build(true)
+                .toUri();
 
         HttpHeaders headers = new HttpHeaders();
         headers.set(MallStatsOpenTokenSupport.TOKEN_HEADER, tokenSupport.createToken(properties));

baqing-admin/src/main/java/com/ruoyi/web/modules/screen/service/impl/TradeSalesScreenServiceImpl.java

@@ -75,14 +75,13 @@ public class TradeSalesScreenServiceImpl implements ITradeSalesScreenService
         vo.setOriginQuote(buildOriginQuote(statDate, quoteStart, quoteEnd));
         List<Integer> finishYears = tradeSalesScreenMapper.selectDistinctFinishYears();
         vo.setAvailableYears(TradeSalesScreenSupport.buildAvailableYears(finishYears));
-        mergeMallStats(vo, statDate, year);
+        mergeMallStats(vo, year);
         return vo;
     }
 
-    private void mergeMallStats(TradeSalesDashboardVo vo, LocalDate statDate, int year)
+    private void mergeMallStats(TradeSalesDashboardVo vo, int year)
     {
-        String statDateStr = HomeScreenSupport.formatStatDate(statDate);
-        MallStatsOverviewVo mall = mallStatsOpenApiClient.fetchOverview(statDateStr, year);
+        MallStatsOverviewVo mall = mallStatsOpenApiClient.fetchOverview(year);
         if (mall != null)
         {
             TradeSalesScreenSupport.applyMallStats(vo, mall);

baqing-admin/src/test/java/com/ruoyi/web/modules/screen/service/impl/TradeSalesScreenServiceImplTest.java

@@ -70,7 +70,7 @@ class TradeSalesScreenServiceImplTest
         when(bizGradeWeightConfigMapper.selectAllOrderBySort()).thenReturn(Collections.emptyList());
         when(tradeSalesScreenMapper.selectTradeMarketIdByName("巴青牦牛交易市场")).thenReturn(null);
         when(tradeSalesScreenMapper.selectDistinctFinishYears()).thenReturn(Arrays.asList(2025, 2026));
-        when(mallStatsOpenApiClient.fetchOverview(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.anyInt()))
+        when(mallStatsOpenApiClient.fetchOverview(org.mockito.ArgumentMatchers.anyInt()))
                 .thenReturn(null);
     }
 
@@ -113,7 +113,7 @@ class TradeSalesScreenServiceImplTest
         feb.setOrderCount(5L);
         trend.setItems(Arrays.asList(jan, feb));
         mall.setMallOrderTrend(trend);
-        when(mallStatsOpenApiClient.fetchOverview(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.eq(2026)))
+        when(mallStatsOpenApiClient.fetchOverview(org.mockito.ArgumentMatchers.eq(2026)))
                 .thenReturn(mall);
 
         TradeSalesDashboardVo vo = service.loadDashboard("2026");