From 858beae020c284e734d1d2859f68e530fba6b3f7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 22 七月 2024 10:43:39 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/AuctionSalesroomQrCodeVO.java | 15 +++++++++++++++
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 17 +++++++++++++++--
2 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/AuctionSalesroomQrCodeVO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/AuctionSalesroomQrCodeVO.java
new file mode 100644
index 0000000..89a3615
--- /dev/null
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/AuctionSalesroomQrCodeVO.java
@@ -0,0 +1,15 @@
+package com.ruoyi.auction.controller.management.vo;
+
+import lombok.Data;
+
+/**
+ * @author mitao
+ * @date 2024/7/22
+ */
+@Data
+public class AuctionSalesroomQrCodeVO {
+
+ private String auctionSalesroomNo;
+ /*拍卖类型 0=线下拍卖 1= 线上线下结合 */
+ private Integer type;
+}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
index d9726fb..62f0852 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
@@ -19,6 +19,7 @@
import com.ruoyi.auction.controller.management.dto.MgtScreenBidPage;
import com.ruoyi.auction.controller.management.dto.MgtScreenSalesroomGoodsDTO;
import com.ruoyi.auction.controller.management.dto.MgtScreenVideoDTO;
+import com.ruoyi.auction.controller.management.vo.AuctionSalesroomQrCodeVO;
import com.ruoyi.auction.controller.management.vo.MgtAuctionBidRecordVO;
import com.ruoyi.auction.controller.management.vo.MgtAuctionSalesroomGoodsVO;
import com.ruoyi.auction.controller.management.vo.MgtAuctionSalesroomScreenVO;
@@ -902,7 +903,16 @@
@Override
public String getQrCode(Long id) throws Exception {
AuctionSalesroom auctionSalesroom = this.getById(id);
- String auctionSalesroomNo = auctionSalesroom.getAuctionSalesroomNo();
+ if (StringUtils.isBlank(auctionSalesroom.getQrCode())) {
+ AuctionSalesroomQrCodeVO vo = new AuctionSalesroomQrCodeVO();
+ Long nextId = IDhelper.getNextId();
+ vo.setAuctionSalesroomNo(nextId.toString());
+ vo.setType(auctionSalesroom.getType().getCode());
+ String url = remoteFileService.obsUpload(
+ CreateQrCode.createQRCodeStream(objectMapper.writeValueAsString(vo))).getData();
+ auctionSalesroom.setQrCode(url);
+ this.updateById(auctionSalesroom);
+ }
return auctionSalesroom.getQrCode();
}
@@ -938,8 +948,11 @@
// 生成唯一编号
Long nextId = IDhelper.getNextId();
auctionSalesroom.setAuctionSalesroomNo(nextId.toString());
+ AuctionSalesroomQrCodeVO vo = new AuctionSalesroomQrCodeVO();
+ vo.setAuctionSalesroomNo(nextId.toString());
+ vo.setType(auctionSalesroom.getType().getCode());
String url = remoteFileService.obsUpload(
- CreateQrCode.createQRCodeStream(nextId.toString())).getData();
+ CreateQrCode.createQRCodeStream(objectMapper.writeValueAsString(vo))).getData();
auctionSalesroom.setQrCode(url);
// 添加
this.save(auctionSalesroom);
--
Gitblit v1.7.1