Bläddra i källkod

verification_url不用生成了,取消

zhangchen 1 månad sedan
förälder
incheckning
3c96e3db3f

+ 0 - 42
alien-store/src/main/java/shop/alien/store/controller/ReservationVerificationQrController.java

@@ -1,42 +0,0 @@
-package shop.alien.store.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.*;
-import shop.alien.entity.result.R;
-import shop.alien.store.service.ReservationVerificationQrService;
-
-/**
- * 核销码二维码生成测试接口(方便联调与测试)
- *
- * @author system
- */
-@Slf4j
-@Api(tags = {"测试-核销码二维码"})
-@CrossOrigin
-@RestController
-@RequestMapping("/test/reservationVerificationQr")
-@RequiredArgsConstructor
-public class ReservationVerificationQrController {
-
-    private final ReservationVerificationQrService reservationVerificationQrService;
-
-    @ApiOperation("根据核销码生成二维码并上传 OSS,返回图片 URL")
-    @ApiImplicitParam(name = "verificationCode", value = "核销码(如 16 位数字)", required = true, paramType = "query", dataType = "String")
-    @GetMapping("/generate")
-    public R<String> generateAndUpload(@RequestParam String verificationCode) {
-        log.info("ReservationVerificationQrController.generateAndUpload?verificationCode={}", verificationCode);
-        if (StringUtils.isBlank(verificationCode)) {
-            return R.fail("核销码不能为空");
-        }
-        String url = reservationVerificationQrService.generateQrImageAndUploadToOss(verificationCode.trim());
-        if (StringUtils.isBlank(url)) {
-            return R.fail("生成或上传二维码失败,请检查 OSS 配置与日志");
-        }
-        return R.data(url);
-    }
-}

+ 0 - 17
alien-store/src/main/java/shop/alien/store/service/ReservationVerificationQrService.java

@@ -1,17 +0,0 @@
-package shop.alien.store.service;
-
-/**
- * 预订订单核销码二维码服务:根据核销码生成二维码图片并上传 OSS,返回访问 URL
- *
- * @author system
- */
-public interface ReservationVerificationQrService {
-
-    /**
-     * 根据核销码内容生成二维码图片并上传 OSS
-     *
-     * @param verificationCode 核销码(二维码内存储的文本)
-     * @return OSS 上图片的完整访问 URL,失败返回 null
-     */
-    String generateQrImageAndUploadToOss(String verificationCode);
-}

+ 0 - 75
alien-store/src/main/java/shop/alien/store/service/impl/ReservationVerificationQrServiceImpl.java

@@ -1,75 +0,0 @@
-package shop.alien.store.service.impl;
-
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.WriterException;
-import com.google.zxing.client.j2se.MatrixToImageWriter;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.qrcode.QRCodeWriter;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-import shop.alien.store.service.ReservationVerificationQrService;
-import shop.alien.util.ali.AliOSSUtil;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * 预订订单核销码二维码:使用 ZXing 生成二维码图片并上传 OSS
- *
- * @author system
- */
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class ReservationVerificationQrServiceImpl implements ReservationVerificationQrService {
-
-    private static final int QR_SIZE = 300;
-    private static final String OSS_DIR = "qrcode/reservation/verification/";
-
-    private final AliOSSUtil aliOSSUtil;
-
-    @Override
-    public String generateQrImageAndUploadToOss(String verificationCode) {
-        if (StringUtils.isBlank(verificationCode)) {
-            log.warn("核销码为空,跳过二维码生成");
-            return null;
-        }
-        byte[] pngBytes = generateQrCodePng(verificationCode.trim());
-        if (pngBytes == null || pngBytes.length == 0) {
-            return null;
-        }
-        String ossPath = OSS_DIR + sanitizeForOssPath(verificationCode.trim()) + "_" + System.currentTimeMillis() + ".png";
-        try (InputStream in = new ByteArrayInputStream(pngBytes)) {
-            String url = aliOSSUtil.uploadFile(in, ossPath);
-            if (StringUtils.isNotBlank(url)) {
-                log.info("核销码二维码已上传 OSS, verificationCode={}, url={}", verificationCode, url);
-                return url;
-            }
-        } catch (IOException e) {
-            log.error("核销码二维码上传 OSS 异常, verificationCode={}", verificationCode, e);
-        }
-        return null;
-    }
-
-    private byte[] generateQrCodePng(String content) {
-        try {
-            QRCodeWriter writer = new QRCodeWriter();
-            BitMatrix matrix = writer.encode(content, BarcodeFormat.QR_CODE, QR_SIZE, QR_SIZE);
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            MatrixToImageWriter.writeToStream(matrix, "PNG", out);
-            return out.toByteArray();
-        } catch (WriterException | IOException e) {
-            log.error("生成核销码二维码图片失败, content={}", content, e);
-            return null;
-        }
-    }
-
-    private static String sanitizeForOssPath(String code) {
-        if (code == null) return "";
-        return code.replaceAll("[^a-zA-Z0-9_-]", "_");
-    }
-}

+ 0 - 5
alien-store/src/main/java/shop/alien/store/strategy/merchantPayment/impl/MerchantAlipayPaymentStrategyImpl.java

@@ -68,7 +68,6 @@ public class MerchantAlipayPaymentStrategyImpl implements MerchantPaymentStrateg
     private final MerchantPaymentOrderService merchantPaymentOrderService;
     private final RefundRecordAsyncService refundRecordAsyncService;
     private final ReservationOrderPaymentTimeoutService reservationOrderPaymentTimeoutService;
-    private final ReservationVerificationQrService reservationVerificationQrService;
     private final UserReservationService userReservationService;
     private final StringRedisTemplate stringRedisTemplate;
 
@@ -262,10 +261,6 @@ public class MerchantAlipayPaymentStrategyImpl implements MerchantPaymentStrateg
                 order.setOrderStatus(1);
                 if (StringUtils.isBlank(order.getVerificationCode())) {
                     order.setVerificationCode("YS" + UniqueRandomNumGenerator.generateUniqueCode(10));
-                    String qrUrl = reservationVerificationQrService.generateQrImageAndUploadToOss(order.getVerificationCode());
-                    if (StringUtils.isNotBlank(qrUrl)) {
-                        order.setVerificationUrl(qrUrl);
-                    }
                 }
                 order.setUpdatedTime(now);
                 userReservationOrderService.updateById(order);

+ 0 - 6
alien-store/src/main/java/shop/alien/store/strategy/merchantPayment/impl/MerchantWechatPaymentStrategyImpl.java

@@ -18,7 +18,6 @@ import shop.alien.store.service.MerchantPaymentOrderService;
 import shop.alien.store.service.RefundRecordAsyncService;
 import shop.alien.store.service.StorePaymentConfigService;
 import shop.alien.store.service.ReservationOrderPaymentTimeoutService;
-import shop.alien.store.service.ReservationVerificationQrService;
 import shop.alien.store.service.UserReservationOrderService;
 import shop.alien.store.service.UserReservationService;
 import shop.alien.store.strategy.merchantPayment.MerchantPaymentStrategy;
@@ -73,7 +72,6 @@ public class MerchantWechatPaymentStrategyImpl implements MerchantPaymentStrateg
     private final MerchantPaymentOrderService merchantPaymentOrderService;
     private final RefundRecordAsyncService refundRecordAsyncService;
     private final ReservationOrderPaymentTimeoutService reservationOrderPaymentTimeoutService;
-    private final ReservationVerificationQrService reservationVerificationQrService;
     private final UserReservationService userReservationService;
     private final StringRedisTemplate stringRedisTemplate;
 
@@ -259,10 +257,6 @@ public class MerchantWechatPaymentStrategyImpl implements MerchantPaymentStrateg
                 order.setOrderStatus(1);
                 if (StringUtils.isBlank(order.getVerificationCode())) {
                     order.setVerificationCode("YS" + UniqueRandomNumGenerator.generateUniqueCode(10));
-                    String qrUrl = reservationVerificationQrService.generateQrImageAndUploadToOss(order.getVerificationCode());
-                    if (StringUtils.isNotBlank(qrUrl)) {
-                        order.setVerificationUrl(qrUrl);
-                    }
                 }
                 order.setUpdatedTime(now);
                 userReservationOrderService.updateById(order);