From 9dbb6c26c81e94e8f969805b40b0e183bf306f83 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 10 三月 2025 13:55:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomConfigController.java | 3 +++
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionSalesroomController.java | 22 +++++++++++++++++-----
ruoyi-modules/ruoyi-auction/src/main/resources/bootstrap.yml | 1 -
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomGoodsVO.java | 9 +++++++++
ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml | 5 ++---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java | 5 -----
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomVO.java | 3 +++
7 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionSalesroomController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionSalesroomController.java
index 4e17a4b..19ebca6 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionSalesroomController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionSalesroomController.java
@@ -37,10 +37,7 @@
import java.io.IOException;
import java.math.BigDecimal;
import java.net.URLEncoder;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
@@ -176,7 +173,22 @@
public void export(@RequestBody MgtAuctionSalesroomQuery query, HttpServletResponse response) {
PageDTO<MgtAuctionSalesroomVO> page = auctionSalesroomService.getAuctionSalesroomPage(query);
if (page.isEmpty()){
- return;
+ response.setContentType(
+ "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setCharacterEncoding("utf-8");
+ // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
+ try {
+ String fileName = URLEncoder.encode(
+ "优惠券领取明细" + DateUtils.format(new Date(), "yyyyMMddHHmmss"), "UTF-8")
+ .replaceAll("\\+", "%20");
+ response.setHeader("Content-disposition",
+ "attachment;filename*=utf-8''" + fileName + ".xlsx");
+ EasyExcel.write(response.getOutputStream(), AuctionBidRecordVO.class)
+ .sheet("优惠券领取明细")
+ .doWrite(new ArrayDeque<>());
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
}
List<MgtAuctionSalesroomVO> list = page.getList();
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomGoodsVO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomGoodsVO.java
index 94ad31a..ad08957 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomGoodsVO.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomGoodsVO.java
@@ -59,6 +59,9 @@
@ApiModelProperty(value = "已拍数量")
private Integer bidQuantity = 0;
+ @ApiModelProperty(value = "可中拍人数")
+ private Integer bidNum;
+
@ApiModelProperty(value = "已拍人数")
private Integer bidPersonCount = 0;
@@ -71,4 +74,10 @@
@ApiModelProperty(value = "商品介绍")
private String description;
+ @ApiModelProperty(value = "最高出价金额")
+ private BigDecimal maxAmount;
+
+ @ApiModelProperty(value = "一次性每人成交数量")
+ private Integer dealQuantity;
+
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomVO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomVO.java
index 96820e2..6956f9d 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomVO.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomVO.java
@@ -82,6 +82,9 @@
@ApiModelProperty(value = "拍卖商品数")
private Integer auctionGoodsNum;
+ @ApiModelProperty(value = "竞拍协议")
+ private String auctionAgreement;
+
@ApiModelProperty(value = "拍卖信息")
private List<MgtAuctionSalesroomGoodsVO> auctionSalesroomGoodsVOS;
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-auction/src/main/resources/bootstrap.yml
index 71f8764..82bdeda 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-auction/src/main/resources/bootstrap.yml
@@ -21,7 +21,6 @@
service: ${spring.application.name}
group: DEFAULT_GROUP
namespace: 689e0f09-d102-460c-ac5c-5ea50a3174be
- ip: 192.168.110.188
config:
# 配置中心地址
server-addr: 192.168.110.188:8848
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
index 51e7216..d1a10ed 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
@@ -340,11 +340,6 @@
@Override
public PageDTO<HomeGoodsSkuListVO> getHomeGoodsSkuVOList(HomeGoodsSkuDTO homeGoodsSkuDTO) {
- Long userId = SecurityUtils.getUserId();
- R<Member> memberR = memberClient.getMemberByUserId(userId, SecurityConstants.INNER);
- Member member = memberR.getData();
- Integer vipClassify = member.getVipClassify();
-
Page<GoodsSku> page = new Page<>();
page.setSize(homeGoodsSkuDTO.getPageSize());
page.setCurrent(homeGoodsSkuDTO.getPageCurr());
diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml
index 062294c..d887b87 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml
@@ -17,14 +17,13 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8848
+ server-addr: 192.168.110.188:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
namespace: 689e0f09-d102-460c-ac5c-5ea50a3174be
- ip: 192.168.110.188
config:
# 配置中心地址
- server-addr: 127.0.0.1:8848
+ server-addr: 192.168.110.188:8848
namespace: 689e0f09-d102-460c-ac5c-5ea50a3174be
group: DEFAULT_GROUP
name: ${spring.application.name}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomConfigController.java
index a694d2f..676f100 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomConfigController.java
@@ -39,6 +39,9 @@
@Resource
private ICustomConfigService iCustomConfigService;
@GetMapping(value = "/{configId}")
+ @ApiOperation("获取配置")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "configId", value = "配置键", required = true)})
public R<CustomConfig> getconfig(@PathVariable String configId)
{
LambdaQueryWrapper<CustomConfig> wrapper = Wrappers.lambdaQuery();
--
Gitblit v1.7.1