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 ae67be7dd..a1d59742d 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 @@ -1,5 +1,6 @@ package com.wzj.soopin.order.business.impl; +import cn.hutool.core.bean.BeanUtil; import com.wzj.soopin.member.domain.po.Member; import com.wzj.soopin.member.service.IMemberService; import com.wzj.soopin.order.business.IOrderBusiness; @@ -23,6 +24,7 @@ import org.springframework.stereotype.Service; import java.io.Serializable; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; @Service @@ -44,13 +46,18 @@ public class OrderBusinessImpl extends BusinessImpl orderItemList = orderItemService.findByOrderId(vo.getId()); + List itemVOList = orderItemList.stream().map(item -> { OrderItemVO itemVO=orderItemConvert.toVO(item); if (itemVO.getTenantId() != null) { SysTenantVo tenant = tenantService.queryByTenantId(item.getTenantId()); itemVO.setTenantName(tenant.getStoreName()); } - //赋值 + Optional.ofNullable(verificationCodeService.getByOrderItemId(item.getId())) + .ifPresent(v -> { + itemVO.setVerificationId(v.getId()); + BeanUtil.copyProperties(v, itemVO,"id"); + }); return itemVO; }).collect(Collectors.toList()); 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 2ca88883a..7c388ee76 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 @@ -18,4 +18,6 @@ public interface VerificationCodeService extends IService { List getByOrderId(Long orderId); void Invalid(Long orderId, List orderItemIdList); + + VerificationCodes getByOrderItemId(Long orderItemId); } 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 7a0cd1acd..8260b455d 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 @@ -135,4 +135,10 @@ public class VerificationCodeServiceImpl extends ServiceImpl