From e5773b55b0d952f81dcc3dff4a372a0d40028efe Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 29 十月 2024 10:32:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TGoodsServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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..5f390ad 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) {
@@ -80,7 +80,7 @@
}
String string = stringBuilder.toString();
// 订单号加上商品类型
- String res = string+"-"+dto.getType();
+ String res = string+"-"+basePage.getType();
List<Integer> data = orderClient.getSalesCountByGoodsId(res).getData();
for (int i = 0; i < list.size(); i++) {
--
Gitblit v1.7.1