1

luofl

2025-03-10 e11ca51759560708c2e47f33124b6bd6365c1e05

1

 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();

 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;

}

 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;
}

 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

 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}

 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();