ruoyi-admin/src/main/java/org/dromara/app/customer/AppOrderController.java

@@ -41,6 +41,7 @@ public class AppOrderController {
     @PostMapping("/page")
     public R<IPage<OrderVO>> page(@RequestBody OrderBo bo){
         LoginUser loginUser= LoginHelper.getLoginUser();
+
         bo.setMemberId(loginUser.getUserId());
         return R.ok(memberOrderService.page(bo));
     }

ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/entity/Sku.java

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.ibatis.type.JdbcType;
 import org.dromara.common.core.domain.model.BaseAudit;
 import org.dromara.common.excel.annotation.Excel;
@@ -24,8 +26,6 @@ import java.math.BigDecimal;
 @Data
 @TableName("pms_sku")
 @Builder
-@AllArgsConstructor
-@NoArgsConstructor
 public class Sku extends BaseAudit implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/business/impl/OrderBusinessImpl.java

@@ -1,6 +1,5 @@
 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;
@@ -24,7 +23,6 @@ import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
 import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Service
@@ -46,22 +44,19 @@ public class OrderBusinessImpl extends BusinessImpl<OrderService, OrderConvert,
 
         //设置明细
         List<OrderItem> orderItemList = orderItemService.findByOrderId(vo.getId());
-
         List<OrderItemVO> 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());
+
         vo.setItems(itemVOList);
         //核销码
+        vo.setVerificationCodes(verificationCodeService.getByOrderId(vo.getId()));
         return vo;
     }
 

ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderItemVO.java

@@ -86,9 +86,9 @@ public class OrderItemVO extends BaseAudit {
     @Excel(name = "商品分类id")
     private Long productCategoryId;
 
-    /** 商品sku属性 */
+    /** 商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}] */
-    @Schema(description = "商品sku属性")
+    @Schema(description = "商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}]")
-    @Excel(name = "商品sku属性")
+    @Excel(name = "商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}]")
     private String spData;
 
     private String tenantId;
@@ -101,10 +101,9 @@ public class OrderItemVO extends BaseAudit {
     @Schema(description = "核销码")
     private String code;
     /**
-     * 状态
+     * 状态 见{@link VerificationCodeStatus}
-     * @see VerificationCodeStatus#getCode()
      */
-    @Schema(description = "状态", implementation = VerificationCodeStatus.class)
+    @Schema(description = "状态")
     private Integer status;
 
     @Schema(description = "用户id")

ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderVO.java

@@ -2,7 +2,6 @@ package com.wzj.soopin.order.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.wzj.soopin.order.domain.entity.VerificationCodes;
-import com.wzj.soopin.order.emum.OrderStatusEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.dromara.common.core.domain.model.BaseAudit;
@@ -63,10 +62,8 @@ public class OrderVO extends BaseAudit {
     private Integer payType;
 
     /**
-     *  订单状态
+     *  订单状态枚举类型见{@link com.wzj.soopin.order.emum.OrderStatusEnum}
-     * @see OrderStatusEnum#getValue()
      */
-    @Schema(description ="订单状态", implementation = OrderStatusEnum.class)
     private Integer status;
 
     @Schema(description="是否处于退款状态")
@@ -133,6 +130,9 @@ public class OrderVO extends BaseAudit {
     @Schema(description = "配送方式 1->到店核销；2->自提;3->配送;")
     private Integer distribution;
 
+    @Schema(description = "核销码")
+    private List<VerificationCodes> verificationCodes;
+
     @Schema(description = "使用的优惠卷id")
     private Long memberCouponId;
 

ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/VerificationCodeService.java

@@ -18,6 +18,4 @@ public interface VerificationCodeService extends IService<VerificationCodes> {
     List<VerificationCodes> getByOrderId(Long orderId);
 
     void Invalid(Long orderId, List<Long> orderItemIdList);
-
-    VerificationCodes getByOrderItemId(Long orderItemId);
 }

ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/VerificationCodeServiceImpl.java

@@ -135,10 +135,4 @@ public class VerificationCodeServiceImpl  extends ServiceImpl<VerificationCodesM
             .in(VerificationCodes::getOrderItemId, orderItemIdList)
             .set(VerificationCodes::getStatus, VerificationCodeStatus.CANCELLED.getCode()));
     }
-
-    @Override
-    public VerificationCodes getByOrderItemId(Long orderItemId) {
-        return codeMapper.selectOne(Wrappers.lambdaQuery(VerificationCodes.class)
-            .eq(VerificationCodes::getOrderItemId, orderItemId));
-    }
 }