Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1

mitao

2025-03-07 f4c3ae03e80895f33d07c5d2f0a58ac81ef97283

Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionSalesroomController.java

@@ -5,6 +5,7 @@
import com.alibaba.excel.util.DateUtils;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.google.zxing.WriterException;
import com.ruoyi.auction.controller.management.dto.MgtAuctionSaleroomBidRecordQuery;
import com.ruoyi.auction.controller.management.dto.MgtAuctionSalesroomDTO;
@@ -16,6 +17,8 @@
import com.ruoyi.auction.mapper.AuctionBidRecordMapper;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
import com.ruoyi.auction.service.IAuctionSalesroomService;
import com.ruoyi.auction.util.weChat.EnvVersion;
import com.ruoyi.auction.util.weChat.WeChatUtil;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
@@ -46,6 +49,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;

/**
@@ -67,6 +71,7 @@
    private final AuctionBidRecordMapper auctionBidRecordMapper;
    private final IAuctionSalesroomGoodsService auctionSalesroomGoodsService;
    private final GoodsSkuClient goodsSkuClient;
    private final WeChatUtil weChatUtil;

    /**
     * 分页查询拍卖场
@@ -91,8 +96,18 @@
    @ApiOperation(value = "查看二维码", notes = "查看二维码")
    public R<String> getQrCode(
            @ApiParam(name = "id", value = "拍卖场id", required = true) @PathVariable("id") Long id) {

        AuctionSalesroom auctionSalesroom = auctionSalesroomService.getById(id);
        if (StringUtils.isNotEmpty(auctionSalesroom.getQrCode())){
            return R.ok(auctionSalesroom.getQrCode());
        }
        try {
            return R.ok(auctionSalesroomService.getQrCode(id));

            String qrCode = weChatUtil.getwxacodeunlimit("pagesA/auctionDetail/auctionDetail", "id=" + auctionSalesroom.getAuctionSalesroomNo(),
                    EnvVersion.RELEASE, null);
            auctionSalesroom.setQrCode(qrCode);
            auctionSalesroomService.updateById(auctionSalesroom);
            return R.ok(qrCode);
        } catch (Exception e) {
            log.info("查看二维码异常", e);
            return R.fail();

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/util/weChat/WeChatUtil.java

@@ -28,11 +28,10 @@
@Component
public class WeChatUtil {

    @Value("${wx.appletsAppid}")
    private String wxAppletsAppid;
    private static final String wxAppletsAppid = "wx69e3ac6e13a889b7";

    @Value("${wx.appletsAppSecret}")
    private String wxAppletsAppSecret;
    private static final String wxAppletsAppSecret = "1b8bcfcb681524ac553e72054e5271ef";


//    @Value("${wx.appid}")
    private String webAppId;