From 59c5450e074572a607908986f8dc2e6dbd1151d5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 23 十月 2024 18:49:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
index 8e5f18f..e09a61f 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
@@ -131,14 +131,20 @@
if (byId==null||byId.getStatus()==2){
return R.fail(2,"该商品已不存在");
}
- return R.ok(byId);}
+// List<Integer> data = orderClient.getSalesCountByGoodsId(String.valueOf(id)).getData();
+// for (int i = 0; i < list.size(); i++) {
+// list.get(i).setSalesCount(data.get(i));
+// }
+
+ return R.ok(byId);
+ }
else {
TCoupon byId = couponService.getById(id);
if (byId==null||byId.getStatus()==2){
return R.fail(2,"该商品已不存在");
}
- return R.ok(byId);
- }
+ return R.ok(byId);
+ }
}
--
Gitblit v1.7.1