guomengjiao 5 months ago
parent
commit
6263e2c902

+ 4 - 0
ruoyi-shop/src/main/java/com/ruoyi/shop/order/domain/ShopOrderComment.java

@@ -35,6 +35,10 @@ public class ShopOrderComment implements Serializable {
      * 订单ID
      * 订单ID
      */
      */
     private Long orderId;
     private Long orderId;
+    /**
+     * 订单详情ID
+     */
+    private Long orderDetailId;
     /**
     /**
      * 订单编号
      * 订单编号
      */
      */

+ 0 - 1
ruoyi-shop/src/main/java/com/ruoyi/shop/order/domain/bo/ShopOrderCommentBo.java

@@ -82,7 +82,6 @@ public class ShopOrderCommentBo extends BaseEntity {
      * 用户ID
      * 用户ID
      */
      */
     @ApiModelProperty(value = "用户ID", required = true)
     @ApiModelProperty(value = "用户ID", required = true)
-    @NotNull(message = "用户ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long userId;
     private Long userId;
 
 
     /**
     /**

+ 5 - 0
ruoyi-shop/src/main/java/com/ruoyi/shop/order/domain/vo/ShopOrderCommentVo.java

@@ -44,6 +44,11 @@ public class ShopOrderCommentVo implements Serializable {
     @ApiModelProperty("订单ID")
     @ApiModelProperty("订单ID")
     private Long orderId;
     private Long orderId;
 
 
+    /**
+     * 订单详情ID
+     */
+    private Long orderDetailId;
+
     /**
     /**
      * 商家id
      * 商家id
      */
      */

+ 2 - 0
ruoyi-shop/src/main/java/com/ruoyi/shop/order/service/impl/ShopOrderCommentServiceImpl.java

@@ -168,6 +168,7 @@ public class ShopOrderCommentServiceImpl implements IShopOrderCommentService {
         UserVo user = iUserService.getUserById(bo.getUserId(), true);
         UserVo user = iUserService.getUserById(bo.getUserId(), true);
         ShopOrderComment shopOrderComment = new ShopOrderComment();
         ShopOrderComment shopOrderComment = new ShopOrderComment();
         shopOrderComment.setOrderId(shopOrderDetail.getOrderId());
         shopOrderComment.setOrderId(shopOrderDetail.getOrderId());
+        shopOrderComment.setOrderDetailId(shopOrderDetail.getOrderDetailId());
         shopOrderComment.setOrderNo(shopOrderDetail.getOrderNo());
         shopOrderComment.setOrderNo(shopOrderDetail.getOrderNo());
         shopOrderComment.setProductId(shopOrderDetail.getProductId());
         shopOrderComment.setProductId(shopOrderDetail.getProductId());
         shopOrderComment.setBusinessId(shopOrderDetail.getBusinessId());
         shopOrderComment.setBusinessId(shopOrderDetail.getBusinessId());
@@ -232,6 +233,7 @@ public class ShopOrderCommentServiceImpl implements IShopOrderCommentService {
         UserVo user = iUserService.getUserById(order.getUserId(), false);
         UserVo user = iUserService.getUserById(order.getUserId(), false);
         ShopOrderComment shopOrderComment = new ShopOrderComment();
         ShopOrderComment shopOrderComment = new ShopOrderComment();
         shopOrderComment.setOrderId(shopOrderDetail.getOrderId());
         shopOrderComment.setOrderId(shopOrderDetail.getOrderId());
+        shopOrderComment.setOrderDetailId(shopOrderDetail.getOrderDetailId());
         shopOrderComment.setOrderNo(shopOrderDetail.getOrderNo());
         shopOrderComment.setOrderNo(shopOrderDetail.getOrderNo());
         shopOrderComment.setProductId(shopOrderDetail.getProductId());
         shopOrderComment.setProductId(shopOrderDetail.getProductId());
         shopOrderComment.setProductTitle(shopOrderDetail.getProductTitle());
         shopOrderComment.setProductTitle(shopOrderDetail.getProductTitle());

+ 2 - 0
ruoyi-shop/src/main/resources/mapper/order/ShopOrderCommentMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.ruoyi.shop.order.domain.ShopOrderComment" id="ShopOrderCommentResult">
     <resultMap type="com.ruoyi.shop.order.domain.ShopOrderComment" id="ShopOrderCommentResult">
         <result property="commentId" column="comment_id"/>
         <result property="commentId" column="comment_id"/>
         <result property="orderId" column="order_id"/>
         <result property="orderId" column="order_id"/>
+        <result property="orderDetailId" column="order_detail_id"/>
         <result property="orderNo" column="order_no"/>
         <result property="orderNo" column="order_no"/>
         <result property="businessId" column="business_id"/>
         <result property="businessId" column="business_id"/>
         <result property="productId" column="product_id"/>
         <result property="productId" column="product_id"/>
@@ -25,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.ruoyi.shop.order.domain.vo.ShopOrderCommentVo" id="ShopOrderCommentResultVo">
     <resultMap type="com.ruoyi.shop.order.domain.vo.ShopOrderCommentVo" id="ShopOrderCommentResultVo">
         <result property="commentId" column="comment_id"/>
         <result property="commentId" column="comment_id"/>
         <result property="orderId" column="order_id"/>
         <result property="orderId" column="order_id"/>
+        <result property="orderDetailId" column="order_detail_id"/>
         <result property="orderNo" column="order_no"/>
         <result property="orderNo" column="order_no"/>
         <result property="productId" column="product_id"/>
         <result property="productId" column="product_id"/>
         <result property="productTitle" column="product_title"/>
         <result property="productTitle" column="product_title"/>