Merge remote-tracking branch 'origin/master'

order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCommentDO.java

@@ -0,0 +1,100 @@
+package cn.iocoder.mall.order.biz.dataobject;
+
+import cn.iocoder.common.framework.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 订单评论表
+ *
+ * @author wtz
+ * @time 2019-05-14 20:48
+ *
+ */
+@Data
+@Accessors(chain = true)
+@TableName(value = "order_comment")
+public class OrderCommentDO extends BaseDO {
+
+    /**
+     * 评论id
+     */
+    private Integer id;
+
+    /**
+     * 订单id
+     */
+    private Integer orderId;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
+    /**
+     * 商品SKUid
+     */
+    private Integer productSkuId;
+
+    /**
+     * 商品SKU属性
+     */
+    private String productSkuAttrs;
+
+    /**
+     * 用户id
+     */
+    private Integer userId;
+
+    /**
+     * 用户头像
+     */
+    private String userAvatar;
+
+    /**
+     * 用户的真实姓名
+     */
+    private String userNickName;
+
+    /**
+     * 评价星
+     */
+    private Integer star;
+
+    /**
+     * 商品描述
+     */
+    private Integer productDescriptionStar;
+
+    /**
+     * 物流评价
+     */
+    private Integer logisticsStar;
+
+    /**
+     * 商家评价
+     */
+    private Integer merchantStar;
+
+    /**
+     * 回复条数
+     */
+    private Integer replayCount;
+
+    /**
+     * 点赞数
+     */
+    private Integer collectCount;
+
+    /**
+     * 评论的内容
+     */
+    private String commentContent;
+
+    /**
+     * 评论的图片地址
+     */
+    private String commentPics;
+
+}

order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCommentReplayDO.java

@@ -0,0 +1,85 @@
+package cn.iocoder.mall.order.biz.dataobject;
+
+import cn.iocoder.common.framework.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 商品评价回复表
+ *
+ * @author wtz
+ * @time 2019-05-14 21:00
+ *
+ */
+@Data
+@Accessors(chain = true)
+@TableName(value = "order_comment_replay")
+public class OrderCommentReplayDO extends BaseDO {
+
+    /**
+     * 回复id
+     */
+    private Integer id;
+
+    /**
+     * 评论id
+     */
+    private Integer commentId;
+
+    /**
+     * 回复的类型
+     */
+    private Integer replyType;
+
+    /**
+     * 父id
+     */
+    private Integer parentId;
+
+    /**
+     * 回复目标用户id
+     */
+    private Integer parentUserId;
+
+    /**
+     * 回复目标用户昵称
+     */
+    private String parentUserNickName;
+
+    /**
+     * 回复目标用户头像
+     */
+    private String parentUserAvatar;
+
+    /**
+     * 回复的数量
+     */
+    private String replyContent;
+
+    /**
+     * 回复用户id
+     */
+    private Integer replyUserId;
+
+    /**
+     * 回复用户昵称
+     */
+    private String replyUserNickName;
+
+    /**
+     * 回复用户头像
+     */
+    private String replyUserAvatar;
+
+    /**
+     * 回复用户身份
+     */
+    private Integer replyUserType;
+
+    /**
+     * 回复点赞数
+     */
+    private Integer replyCollectCount;
+
+}

order/order-service-impl/src/main/resources/config/application.yaml

@@ -7,7 +7,7 @@ spring:
     password: ${MALL_MYSQL_PASSWORD}
 
 # mybatis
-mybatis:
+#mybatis:
 #  config-location: classpath:mybatis-config.xml
 #  mapper-locations: classpath:mapper/*.xml
 #  type-aliases-package: cn.iocoder.mall.order.biz.dataobject
@@ -21,6 +21,7 @@ mybatis-plus:
       id-type: auto
   mapper-locations: classpath*:mapper/*.xml
   type-aliases-package: cn.iocoder.mall.order.biz.dataobject
+  config-location: classpath:mybatis-config.xml
 
 # dubbo
 dubbo: