From 80835bcc12f4788c1a88da61e623b362e57f1cb1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 24 八月 2024 09:31:43 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TGoodsServiceImpl.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 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 f74785a..7a58640 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,7 @@
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;
import com.ruoyi.other.api.domain.TGoods;
@@ -45,6 +47,40 @@
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));
+ }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+ @Override
+ 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,basePage);
+
+ StringBuilder stringBuilder = new StringBuilder();
+ for (TGoods temp : list) {
+ stringBuilder.append(temp.getId()).append(",");
+ }
+ if (StringUtils.hasLength(stringBuilder)){
+ // 去除最后一个字符
+ stringBuilder.deleteCharAt(stringBuilder.length()-1);
+ }
+ if (list.isEmpty()) {
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+ String string = stringBuilder.toString();
+ // 订单号加上商品类型
String res = string+"-"+dto.getType();
List<Integer> data = orderClient.getSalesCountByGoodsId(res).getData();
--
Gitblit v1.7.1