From ccf2c6b02e65c66869d9d691df8f195e534ecaf9 Mon Sep 17 00:00:00 2001
From: wangqx <wangqingxiang@wzj.com>
Date: Fri, 12 Sep 2025 16:24:06 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=A0=B8=E9=94=80=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/impl/OrderBusinessImpl.java      |  6 +++++-
 .../wzj/soopin/order/domain/vo/OrderVO.java   |  4 ++--
 .../service/VerificationCodeService.java      |  6 ++++--
 .../impl/VerificationCodeServiceImpl.java     | 21 +++++++------------
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/business/impl/OrderBusinessImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/business/impl/OrderBusinessImpl.java
index 864cdf238..307d7f0f9 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/business/impl/OrderBusinessImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/business/impl/OrderBusinessImpl.java
@@ -12,6 +12,7 @@ import com.wzj.soopin.order.domain.vo.OrderItemVO;
 import com.wzj.soopin.order.domain.vo.OrderVO;
 import com.wzj.soopin.order.service.OrderItemService;
 import com.wzj.soopin.order.service.OrderService;
+import com.wzj.soopin.order.service.VerificationCodeService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.web.core.BusinessImpl;
@@ -28,6 +29,7 @@ public class OrderBusinessImpl extends BusinessImpl<OrderService, OrderConvert,
     private final IMemberService memberService;
     private final OrderItemService orderItemService;
     private final OrderItemConvert orderItemConvert;
+    private final VerificationCodeService verificationCodeService;
 
     @Override
     public OrderVO info(Serializable id) {
@@ -43,7 +45,9 @@ public class OrderBusinessImpl extends BusinessImpl<OrderService, OrderConvert,
             //赋值
             return itemVO;
         }).collect(Collectors.toList());
-        vo.setItems(itemVOList);
+
+        //核销码
+        vo.setVerificationCodes(verificationCodeService.getByOrderId(vo.getId()));
         return vo;
     }
 }
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderVO.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderVO.java
index f0a90025c..d3ea5ef8a 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderVO.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderVO.java
@@ -1,7 +1,7 @@
 package com.wzj.soopin.order.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.wzj.soopin.order.domain.entity.OrderItem;
+import com.wzj.soopin.order.domain.entity.VerificationCodes;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.dromara.common.core.domain.model.BaseAudit;
@@ -159,7 +159,7 @@ public class OrderVO extends BaseAudit {
     private Integer distribution;
 
     @Schema(description = "核销码")
-    private String code;
+    private List<VerificationCodes> verificationCodes;
 
     @Schema(description = "使用的优惠卷id")
     private Long memberCouponId;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/VerificationCodeService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/VerificationCodeService.java
index 8e0b6bc8d..9ae8e5795 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/VerificationCodeService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/VerificationCodeService.java
@@ -1,12 +1,12 @@
 package com.wzj.soopin.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.wzj.soopin.order.domain.dto.CodeVerificationDto;
 import com.wzj.soopin.order.domain.entity.VerificationCodes;
 import com.wzj.soopin.order.domain.vo.ManagerOrderDetailVO;
-import com.wzj.soopin.order.domain.vo.OrderVO;
 import org.dromara.common.core.domain.R;
 
+import java.util.List;
+
 public interface VerificationCodeService extends IService<VerificationCodes> {
 
 
@@ -15,4 +15,6 @@ public interface VerificationCodeService extends IService<VerificationCodes> {
     void verifyCode(String  code,String tenantId);
 
     ManagerOrderDetailVO scan(String code);
+
+    List<VerificationCodes> getByOrderId(Long orderId);
 }
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/VerificationCodeServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/VerificationCodeServiceImpl.java
index e729d1400..3b8a31cd3 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/VerificationCodeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/VerificationCodeServiceImpl.java
@@ -2,13 +2,9 @@ package com.wzj.soopin.order.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wzj.soopin.content.domain.po.Vlog;
-import com.wzj.soopin.order.domain.dto.CodeVerificationDto;
 import com.wzj.soopin.order.domain.entity.Order;
 import com.wzj.soopin.order.domain.entity.VerificationCodes;
-import com.wzj.soopin.order.domain.entity.VerificationLogs;
 import com.wzj.soopin.order.domain.vo.ManagerOrderDetailVO;
-import com.wzj.soopin.order.domain.vo.OrderVO;
 import com.wzj.soopin.order.mapper.OrderMapper;
 import com.wzj.soopin.order.mapper.VerificationCodesMapper;
 import com.wzj.soopin.order.mapper.VerificationLogsMapper;
@@ -19,18 +15,10 @@ import com.wzj.soopin.order.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.domain.R;
-import org.dromara.common.core.domain.model.LoginUser;
-import org.dromara.common.mq.config.RocketMQConfig;
-import org.dromara.common.mq.domain.MQMessage;
-import org.dromara.common.mq.enums.MessageActionEnum;
-import org.dromara.common.mq.utils.MqUtil;
-import org.dromara.common.satoken.utils.LoginHelper;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.List;
 
 /**
  * @author fxh
@@ -226,5 +214,10 @@ public class VerificationCodeServiceImpl  extends ServiceImpl<VerificationCodesM
         return uuid.substring(0, 16).toUpperCase();
     }
 
-
+    @Override
+    public List<VerificationCodes> getByOrderId(Long orderId) {
+        LambdaQueryWrapper<VerificationCodes> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(VerificationCodes::getOrderId, orderId);
+        return codeMapper.selectList(wrapper);
+    }
 }