From 2a5f6eceaef1483bb88157c61afc7a66705d88a0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 20 六月 2025 15:25:28 +0800
Subject: [PATCH] 监管平台bug修改

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TGoodsServiceImpl.java |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TGoodsServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TGoodsServiceImpl.java
index 7372668..d5e2f68 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TGoodsServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TGoodsServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ruoyi.other.service.impl;
 
+import com.ruoyi.common.core.dto.AppGoodQuery;
 import com.ruoyi.common.core.web.page.BasePage;
 import com.ruoyi.common.core.web.page.PageInfo;
 import com.ruoyi.order.api.feignClient.OrderClient;
@@ -57,14 +58,13 @@
         return pageInfo;
     }
     @Override
-    public PageInfo<TGoods> pageList1(BasePage basePage) {
+    public PageInfo<TGoods> pageList1(AppGoodQuery basePage) {
         GoodsDTO dto = new GoodsDTO();
-        dto.setType(2);
         dto.setStatus(1);
         dto.setPageCurr(basePage.getPageCurr());
         dto.setPageSize(basePage.getPageSize());
         PageInfo<TGoods> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
-        List<TGoods> list = this.baseMapper.pageList1(pageInfo);
+        List<TGoods> list = this.baseMapper.pageList1(pageInfo,basePage);
 
         StringBuilder stringBuilder = new StringBuilder();
         for (TGoods temp : list) {
@@ -78,14 +78,11 @@
             pageInfo.setRecords(list);
             return pageInfo;
         }
-        String string = stringBuilder.toString();
-        // 订单号加上商品类型
-        String res = string+"-"+dto.getType();
-
-        List<Integer> data = orderClient.getSalesCountByGoodsId(res).getData();
-        for (int i = 0; i < list.size(); i++) {
-            list.get(i).setSalesCount(data.get(i));
+        for (TGoods tGoods : list) {
+            Integer data = orderClient.getSalesCountByGoodsIdgetCount(tGoods.getId(), tGoods.getGoodType(), basePage.getType()).getData();
+            tGoods.setSalesCount(data);
         }
+
         pageInfo.setRecords(list);
         return pageInfo;
     }

--
Gitblit v1.7.1