diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminOrderService.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminOrderService.java index 9d1ea376..374419ef 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminOrderService.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminOrderService.java @@ -229,16 +229,18 @@ public class AdminOrderService { return ResponseUtil.badArgument(); } // 目前只支持回复一次 - if (commentService.findById(commentId).getAdminContent().length() != 0) { + LitemallComment comment = commentService.findById(commentId); + if(comment == null){ + return ResponseUtil.badArgument(); + } + if (!StringUtils.isEmpty(comment.getAdminContent())) { return ResponseUtil.fail(ORDER_REPLY_EXIST, "订单商品已回复！"); } String content = JacksonUtil.parseString(body, "content"); if (StringUtils.isEmpty(content)) { return ResponseUtil.badArgument(); } - // 创建评价回复 - LitemallComment comment = new LitemallComment(); - comment.setId(commentId); + // 更新评价回复 comment.setAdminContent(content); commentService.updateById(comment); diff --git a/litemall-db/sql/litemall_table.sql b/litemall-db/sql/litemall_table.sql index 9ad752ac..744cb45c 100644 --- a/litemall-db/sql/litemall_table.sql +++ b/litemall-db/sql/litemall_table.sql @@ -192,8 +192,9 @@ DROP TABLE IF EXISTS `litemall_comment`; CREATE TABLE `litemall_comment` ( `id` int(11) NOT NULL AUTO_INCREMENT, `value_id` int(11) NOT NULL DEFAULT '0' COMMENT '如果type=0，则是商品评论；如果是type=1，则是专题评论。', - `type` tinyint(3) NOT NULL DEFAULT '0' COMMENT '评论类型，如果type=0，则是商品评论；如果是type=1，则是专题评论；如果type=3，则是订单商品评论。', + `type` tinyint(3) NOT NULL DEFAULT '0' COMMENT '评论类型，如果type=0，则是商品评论；如果是type=1，则是专题评论；', `content` varchar(1023) NOT NULL COMMENT '评论内容', + `admin_content` varchar(511) NOT NULL COMMENT '管理员回复内容', `user_id` int(11) NOT NULL DEFAULT '0' COMMENT '用户表的用户ID', `has_picture` tinyint(1) DEFAULT '0' COMMENT '是否含有图片', `pic_urls` varchar(1023) DEFAULT NULL COMMENT '图片地址列表，采用JSON数组格式', diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCommentExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCommentExample.java index 4046466a..8f5f3400 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCommentExample.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCommentExample.java @@ -811,6 +811,142 @@ public class LitemallCommentExample { return (Criteria) this; } + public Criteria andAdminContentIsNull() { + addCriterion("admin_content is null"); + return (Criteria) this; + } + + public Criteria andAdminContentIsNotNull() { + addCriterion("admin_content is not null"); + return (Criteria) this; + } + + public Criteria andAdminContentEqualTo(String value) { + addCriterion("admin_content =", value, "adminContent"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_comment + * + * @mbg.generated + */ + public Criteria andAdminContentEqualToColumn(LitemallComment.Column column) { + addCriterion(new StringBuilder("admin_content = ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andAdminContentNotEqualTo(String value) { + addCriterion("admin_content <>", value, "adminContent"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_comment + * + * @mbg.generated + */ + public Criteria andAdminContentNotEqualToColumn(LitemallComment.Column column) { + addCriterion(new StringBuilder("admin_content <> ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andAdminContentGreaterThan(String value) { + addCriterion("admin_content >", value, "adminContent"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_comment + * + * @mbg.generated + */ + public Criteria andAdminContentGreaterThanColumn(LitemallComment.Column column) { + addCriterion(new StringBuilder("admin_content > ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andAdminContentGreaterThanOrEqualTo(String value) { + addCriterion("admin_content >=", value, "adminContent"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_comment + * + * @mbg.generated + */ + public Criteria andAdminContentGreaterThanOrEqualToColumn(LitemallComment.Column column) { + addCriterion(new StringBuilder("admin_content >= ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andAdminContentLessThan(String value) { + addCriterion("admin_content <", value, "adminContent"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_comment + * + * @mbg.generated + */ + public Criteria andAdminContentLessThanColumn(LitemallComment.Column column) { + addCriterion(new StringBuilder("admin_content < ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andAdminContentLessThanOrEqualTo(String value) { + addCriterion("admin_content <=", value, "adminContent"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_comment + * + * @mbg.generated + */ + public Criteria andAdminContentLessThanOrEqualToColumn(LitemallComment.Column column) { + addCriterion(new StringBuilder("admin_content <= ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andAdminContentLike(String value) { + addCriterion("admin_content like", value, "adminContent"); + return (Criteria) this; + } + + public Criteria andAdminContentNotLike(String value) { + addCriterion("admin_content not like", value, "adminContent"); + return (Criteria) this; + } + + public Criteria andAdminContentIn(List values) { + addCriterion("admin_content in", values, "adminContent"); + return (Criteria) this; + } + + public Criteria andAdminContentNotIn(List values) { + addCriterion("admin_content not in", values, "adminContent"); + return (Criteria) this; + } + + public Criteria andAdminContentBetween(String value1, String value2) { + addCriterion("admin_content between", value1, value2, "adminContent"); + return (Criteria) this; + } + + public Criteria andAdminContentNotBetween(String value1, String value2) { + addCriterion("admin_content not between", value1, value2, "adminContent"); + return (Criteria) this; + } + public Criteria andUserIdIsNull() { addCriterion("user_id is null"); return (Criteria) this; diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCommentService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCommentService.java index a490f18b..8cd40cdd 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCommentService.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCommentService.java @@ -83,17 +83,6 @@ public class LitemallCommentService { commentMapper.logicalDeleteByPrimaryKey(id); } - public String queryReply(Integer id) { - LitemallCommentExample example = new LitemallCommentExample(); - example.or().andTypeEqualTo((byte) 2).andValueIdEqualTo(id); - List commentReply = commentMapper.selectByExampleSelective(example, LitemallComment.Column.content); - // 目前业务只支持回复一次 - if (commentReply.size() == 1) { - return commentReply.get(0).getContent(); - } - return null; - } - public LitemallComment findById(Integer id) { return commentMapper.selectByPrimaryKey(id); } diff --git a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallCommentMapper.xml b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallCommentMapper.xml index 6981e44c..799f117f 100644 --- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallCommentMapper.xml +++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallCommentMapper.xml @@ -128,8 +128,8 @@ WARNING - @mbg.generated This element is automatically generated by MyBatis Generator, do not modify. --> - id, value_id, `type`, content, admin_content, user_id, has_picture, pic_urls, star, add_time, update_time, - deleted + id, value_id, `type`, content, admin_content, user_id, has_picture, pic_urls, star, + add_time, update_time, deleted