评价

gic-evaluate-api/src/main/java/com/gic/evaluate/constant/ComputeEnum.java

+package com.gic.evaluate.constant;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2019-12-27 10:33
+ */
+public enum ComputeEnum {
+    GT(">",1, "大于"),
+    GTE(">=",3,  "大于等于"),
+    EQ("=", 2, "等于"),
+    LTE("<=", 3, "小于等于"),
+    LT("<", 1, "小于");
+    private String compute;
+    private Integer code;
+    private String msg;
+
+    ComputeEnum(String compute, Integer code, String msg) {
+        this.compute = compute;
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public String getCompute() {
+        return compute;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public static String parseCodeToCompute(Integer code) {
+        for (ComputeEnum computeEnum : values()) {
+            if (computeEnum.code.equals(code)) {
+                return computeEnum.compute;
+            }
+        }
+        return null;
+    }
+}

gic-evaluate-api/src/main/java/com/gic/evaluate/constant/GreaterEnum.java

@@ -32,4 +32,13 @@ public enum GreaterEnum {
     public String getMsg() {
         return msg;
     }
+
+    public static String parseCodeToCompute(Integer code) {
+        for (GreaterEnum greater : values()) {
+            if (greater.code.equals(code)) {
+                return greater.compute;
+            }
+        }
+        return null;
+    }
 }

gic-evaluate-api/src/main/java/com/gic/evaluate/constant/LessEnum.java

@@ -32,4 +32,13 @@ public enum LessEnum {
     public String getMsg() {
         return msg;
     }
+
+    public static String parseCodeToCompute(Integer code) {
+        for (LessEnum less : values()) {
+            if (less.code.equals(code)) {
+                return less.compute;
+            }
+        }
+        return null;
+    }
 }

gic-evaluate-api/src/main/java/com/gic/evaluate/constant/ReplyerTypeEnum.java

+package com.gic.evaluate.constant;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2019-12-27 14:02
+ */
+public enum ReplyerTypeEnum {
+    /**
+     * 会员
+     */
+    MEMBER(1),
+    /**
+     * 管理员
+     */
+    USER(2),
+    ;
+    private Integer code;
+
+    ReplyerTypeEnum(Integer code) {
+        this.code = code;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+}

gic-evaluate-api/src/main/java/com/gic/evaluate/dto/EvaluateDTO.java

+package com.gic.evaluate.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2019-12-26 17:55
+ */
+public class EvaluateDTO implements Serializable {
+    private static final long serialVersionUID = -4459192805222309115L;
+
+    /**
+     *
+     */
+    private Integer evaluateId;
+
+    /**
+     * 商户id
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 门店id
+     */
+    private Integer storeId;
+
+    /**
+     * 会员id
+     */
+    private Long memberId;
+
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+    /**
+     * 评语
+     */
+    private String evaluateContent;
+
+    /**
+     * 商品质量
+     */
+    private Integer goodsScore;
+
+    /**
+     * 门店环境
+     */
+    private Integer storeScore;
+
+    /**
+     * 导购服务
+     */
+    private Integer serviceScore;
+
+    /**
+     * 首次评价之间
+     */
+    private Date evaluateTime;
+
+    /**
+     * 会员名称
+     */
+    private String memberName;
+
+    /**
+     *
+     */
+    private String memberPhone;
+
+    /**
+     * 会员信息头像
+     */
+    private String memberImgUrl;
+
+    /**
+     * 商品信息
+     */
+    private Long goodsId;
+
+    /**
+     * 商品信息
+     */
+    private String goodsInfo;
+
+    /**
+     * 门店名称
+     */
+    private String storeName;
+
+    /**
+     * 门店code
+     */
+    private String storeCode;
+
+    /**
+     * 订单号
+     */
+    private String orderNumber;
+
+    /**
+     * 订单实际消费日期
+     */
+    private Date receiptsDate;
+
+    /**
+     * 导购id
+     */
+    private Integer clerkId;
+
+    /**
+     * 导购名
+     */
+    private String clerkName;
+
+    /**
+     * 是否是不良评价
+     */
+    private Integer badEvaluateStatus;
+
+    /**
+     * 是否是好评
+     */
+    private Integer goodEvaluateStatus;
+
+    /**
+     * 是否有追评
+     */
+    private Integer reviewStatus;
+
+    /**
+     * 是否是置顶热评
+     */
+    private Integer topHotStatus;
+
+    /**
+     * 是否是恶意评论
+     */
+    private Integer maliciousStatus;
+
+    /**
+     * 是否展示
+     */
+    private Integer showStatus;
+
+    /**
+     * 回访状态（0：待分配，1：已分配，2：回访结束，3：回访逾期，4：不分配，5：无需回访 ，6：回访取消）
+     */
+    private Integer visitStatus;
+
+    /**
+     * 评论状态  0未回复   1有回复   2有追评
+     */
+    private Integer replyStatus;
+
+    /**
+     *
+     */
+    private Integer status;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    private List<EvaluateReplyDTO> replyList;
+
+    public Integer getEvaluateId() {
+        return evaluateId;
+    }
+
+    public void setEvaluateId(Integer evaluateId) {
+        this.evaluateId = evaluateId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Integer getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Integer storeId) {
+        this.storeId = storeId;
+    }
+
+    public Long getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(Long memberId) {
+        this.memberId = memberId;
+    }
+
+    public Long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Long orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getEvaluateContent() {
+        return evaluateContent;
+    }
+
+    public void setEvaluateContent(String evaluateContent) {
+        this.evaluateContent = evaluateContent;
+    }
+
+    public Integer getGoodsScore() {
+        return goodsScore;
+    }
+
+    public void setGoodsScore(Integer goodsScore) {
+        this.goodsScore = goodsScore;
+    }
+
+    public Integer getStoreScore() {
+        return storeScore;
+    }
+
+    public void setStoreScore(Integer storeScore) {
+        this.storeScore = storeScore;
+    }
+
+    public Integer getServiceScore() {
+        return serviceScore;
+    }
+
+    public void setServiceScore(Integer serviceScore) {
+        this.serviceScore = serviceScore;
+    }
+
+    public Date getEvaluateTime() {
+        return evaluateTime;
+    }
+
+    public void setEvaluateTime(Date evaluateTime) {
+        this.evaluateTime = evaluateTime;
+    }
+
+    public String getMemberName() {
+        return memberName;
+    }
+
+    public void setMemberName(String memberName) {
+        this.memberName = memberName;
+    }
+
+    public String getMemberPhone() {
+        return memberPhone;
+    }
+
+    public void setMemberPhone(String memberPhone) {
+        this.memberPhone = memberPhone;
+    }
+
+    public String getMemberImgUrl() {
+        return memberImgUrl;
+    }
+
+    public void setMemberImgUrl(String memberImgUrl) {
+        this.memberImgUrl = memberImgUrl;
+    }
+
+    public Long getGoodsId() {
+        return goodsId;
+    }
+
+    public void setGoodsId(Long goodsId) {
+        this.goodsId = goodsId;
+    }
+
+    public String getGoodsInfo() {
+        return goodsInfo;
+    }
+
+    public void setGoodsInfo(String goodsInfo) {
+        this.goodsInfo = goodsInfo;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getStoreCode() {
+        return storeCode;
+    }
+
+    public void setStoreCode(String storeCode) {
+        this.storeCode = storeCode;
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    public Date getReceiptsDate() {
+        return receiptsDate;
+    }
+
+    public void setReceiptsDate(Date receiptsDate) {
+        this.receiptsDate = receiptsDate;
+    }
+
+    public Integer getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(Integer clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public String getClerkName() {
+        return clerkName;
+    }
+
+    public void setClerkName(String clerkName) {
+        this.clerkName = clerkName;
+    }
+
+    public Integer getBadEvaluateStatus() {
+        return badEvaluateStatus;
+    }
+
+    public void setBadEvaluateStatus(Integer badEvaluateStatus) {
+        this.badEvaluateStatus = badEvaluateStatus;
+    }
+
+    public Integer getGoodEvaluateStatus() {
+        return goodEvaluateStatus;
+    }
+
+    public void setGoodEvaluateStatus(Integer goodEvaluateStatus) {
+        this.goodEvaluateStatus = goodEvaluateStatus;
+    }
+
+    public Integer getReviewStatus() {
+        return reviewStatus;
+    }
+
+    public void setReviewStatus(Integer reviewStatus) {
+        this.reviewStatus = reviewStatus;
+    }
+
+    public Integer getTopHotStatus() {
+        return topHotStatus;
+    }
+
+    public void setTopHotStatus(Integer topHotStatus) {
+        this.topHotStatus = topHotStatus;
+    }
+
+    public Integer getMaliciousStatus() {
+        return maliciousStatus;
+    }
+
+    public void setMaliciousStatus(Integer maliciousStatus) {
+        this.maliciousStatus = maliciousStatus;
+    }
+
+    public Integer getShowStatus() {
+        return showStatus;
+    }
+
+    public void setShowStatus(Integer showStatus) {
+        this.showStatus = showStatus;
+    }
+
+    public Integer getVisitStatus() {
+        return visitStatus;
+    }
+
+    public void setVisitStatus(Integer visitStatus) {
+        this.visitStatus = visitStatus;
+    }
+
+    public Integer getReplyStatus() {
+        return replyStatus;
+    }
+
+    public void setReplyStatus(Integer replyStatus) {
+        this.replyStatus = replyStatus;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public List<EvaluateReplyDTO> getReplyList() {
+        return replyList;
+    }
+
+    public void setReplyList(List<EvaluateReplyDTO> replyList) {
+        this.replyList = replyList;
+    }
+}

gic-evaluate-api/src/main/java/com/gic/evaluate/dto/EvaluateReplyDTO.java

+package com.gic.evaluate.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2019-12-26 18:29
+ */
+public class EvaluateReplyDTO implements Serializable {
+    private static final long serialVersionUID = 8035238086312771905L;
+
+    /**
+     *
+     */
+    private Integer evaluateReplyId;
+
+    /**
+     * 商户id
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 评论id
+     */
+    private Integer evaluateId;
+
+    /**
+     * 回复时间
+     */
+    private Date replyDate;
+
+    /**
+     * 1:会员      2:店员
+     */
+    private Integer replyerType;
+
+    /**
+     * 回复内容
+     */
+    private String replyContent;
+
+    /**
+     *
+     */
+    private Integer memberId;
+
+    /**
+     *
+     */
+    private String memberName;
+
+    /**
+     *
+     */
+    private Integer userId;
+
+    /**
+     *
+     */
+    private String userName;
+
+    public Integer getEvaluateReplyId() {
+        return evaluateReplyId;
+    }
+
+    public void setEvaluateReplyId(Integer evaluateReplyId) {
+        this.evaluateReplyId = evaluateReplyId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Integer getEvaluateId() {
+        return evaluateId;
+    }
+
+    public void setEvaluateId(Integer evaluateId) {
+        this.evaluateId = evaluateId;
+    }
+
+    public Date getReplyDate() {
+        return replyDate;
+    }
+
+    public void setReplyDate(Date replyDate) {
+        this.replyDate = replyDate;
+    }
+
+    public Integer getReplyerType() {
+        return replyerType;
+    }
+
+    public void setReplyerType(Integer replyerType) {
+        this.replyerType = replyerType;
+    }
+
+    public String getReplyContent() {
+        return replyContent;
+    }
+
+    public void setReplyContent(String replyContent) {
+        this.replyContent = replyContent;
+    }
+
+    public Integer getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(Integer memberId) {
+        this.memberId = memberId;
+    }
+
+    public String getMemberName() {
+        return memberName;
+    }
+
+    public void setMemberName(String memberName) {
+        this.memberName = memberName;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+}

gic-evaluate-api/src/main/java/com/gic/evaluate/dto/MemberReplyDTO.java

+package com.gic.evaluate.dto;
+
+import java.io.Serializable;
+
+/**
+ * 会员回复
+ * @Description:
+ * @author zhiwj
+ * @date 2019-12-26 18:32
+ */
+public class MemberReplyDTO implements Serializable {
+    private static final long serialVersionUID = 4919895618830625309L;
+
+    /**
+     * 商户id
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 评论id
+     */
+    private Integer evaluateId;
+
+    /**
+     * 回复内容
+     */
+    private String replyContent;
+
+    /**
+     *
+     */
+    private Integer memberId;
+
+    /**
+     *
+     */
+    private String memberName;
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Integer getEvaluateId() {
+        return evaluateId;
+    }
+
+    public void setEvaluateId(Integer evaluateId) {
+        this.evaluateId = evaluateId;
+    }
+
+    public String getReplyContent() {
+        return replyContent;
+    }
+
+    public void setReplyContent(String replyContent) {
+        this.replyContent = replyContent;
+    }
+
+    public Integer getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(Integer memberId) {
+        this.memberId = memberId;
+    }
+
+    public String getMemberName() {
+        return memberName;
+    }
+
+    public void setMemberName(String memberName) {
+        this.memberName = memberName;
+    }
+}

gic-evaluate-api/src/main/java/com/gic/evaluate/dto/UserReplyDTO.java

+package com.gic.evaluate.dto;
+
+import java.io.Serializable;
+
+/**
+ * 管理员回复
+ * @Description:
+ * @author zhiwj
+ * @date 2019-12-26 18:32
+ */
+public class UserReplyDTO implements Serializable {
+    private static final long serialVersionUID = -7855916448409509250L;
+    /**
+     *
+     */
+    private Integer evaluateReplyId;
+
+    /**
+     * 商户id
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 评论id
+     */
+    private Integer evaluateId;
+
+    /**
+     * 回复内容
+     */
+    private String replyContent;
+
+    /**
+     *
+     */
+    private Integer userId;
+
+    /**
+     *
+     */
+    private String userName;
+
+    public Integer getEvaluateReplyId() {
+        return evaluateReplyId;
+    }
+
+    public void setEvaluateReplyId(Integer evaluateReplyId) {
+        this.evaluateReplyId = evaluateReplyId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Integer getEvaluateId() {
+        return evaluateId;
+    }
+
+    public void setEvaluateId(Integer evaluateId) {
+        this.evaluateId = evaluateId;
+    }
+
+    public String getReplyContent() {
+        return replyContent;
+    }
+
+    public void setReplyContent(String replyContent) {
+        this.replyContent = replyContent;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+}

gic-evaluate-api/src/main/java/com/gic/evaluate/qo/EvaluateQO.java

@@ -2,8 +2,6 @@ package com.gic.evaluate.qo;
 
 import com.gic.enterprise.qo.PageQO;
 
-import java.util.List;
-
 /**
  * 
  * @ClassName: EvaluateQO
@@ -14,20 +12,87 @@ import java.util.List;
 public class EvaluateQO extends PageQO{
     private static final long serialVersionUID = 3863482060139969653L;
 
+
+    private Integer enterpriseId;
+
     /**
-     * 用户名\手机号码
+     * 订单号 会员姓名 手机号 评语内容 门店名称
      */
     private String search;
 
-    private Integer enterpriseId;
+    private String startTime;
+
+    private String endTime;
+
+    /**
+     * 不良评价
+     */
+    private Integer badEvaluateStatus;
+
+    /**
+     * 好评
+     */
+    private Integer goodEvaluateStatus;
+
+    /**
+     * 有追评
+     */
+    private Integer reviewStatus;
+
+    /**
+     * 指定热评
+     */
+    private Integer topHotStatus;
+
+    /**
+     * 恶意评论
+     */
+    private Integer maliciousStatus;
+
+    private Integer goodsType;
+    private String goodsCompute;
+    private Integer goodsScore;
+
+    private Integer storeType;
+    private String storeCompute;
+    private Integer storeScore;
+
+    private Integer serviceType;
+    private String serviceCompute;
+    private Integer serviceScore;
+
+    /**
+     * 回复状态
+     */
+    private Integer replyStatus;
+
+    /**
+     * 任务分配状态
+     */
+    private Integer visitStatus;
 
-    private Integer roleId;
+    /**
+     * 是否展示
+     */
+    private Integer showStatus;
+
+    /**
+     * 1:首次评价时间  2：订单时间
+     */
+    private Integer orderByField;
 
-    private Integer resourceId;
+    /**
+     * 1:asc  2:desc
+     */
+    private Integer orderByType;
 
-    private Integer accountGroupId;
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
 
-    private List<Integer> userIdList;
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
 
     public String getSearch() {
         return search;
@@ -37,43 +102,171 @@ public class EvaluateQO extends PageQO{
         this.search = search;
     }
 
-    public Integer getEnterpriseId() {
-        return enterpriseId;
+    public String getStartTime() {
+        return startTime;
     }
 
-    public void setEnterpriseId(Integer enterpriseId) {
-        this.enterpriseId = enterpriseId;
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public Integer getBadEvaluateStatus() {
+        return badEvaluateStatus;
+    }
+
+    public void setBadEvaluateStatus(Integer badEvaluateStatus) {
+        this.badEvaluateStatus = badEvaluateStatus;
+    }
+
+    public Integer getGoodEvaluateStatus() {
+        return goodEvaluateStatus;
+    }
+
+    public void setGoodEvaluateStatus(Integer goodEvaluateStatus) {
+        this.goodEvaluateStatus = goodEvaluateStatus;
+    }
+
+    public Integer getReviewStatus() {
+        return reviewStatus;
+    }
+
+    public void setReviewStatus(Integer reviewStatus) {
+        this.reviewStatus = reviewStatus;
+    }
+
+    public Integer getTopHotStatus() {
+        return topHotStatus;
+    }
+
+    public void setTopHotStatus(Integer topHotStatus) {
+        this.topHotStatus = topHotStatus;
+    }
+
+    public Integer getMaliciousStatus() {
+        return maliciousStatus;
+    }
+
+    public void setMaliciousStatus(Integer maliciousStatus) {
+        this.maliciousStatus = maliciousStatus;
+    }
+
+    public Integer getGoodsType() {
+        return goodsType;
+    }
+
+    public void setGoodsType(Integer goodsType) {
+        this.goodsType = goodsType;
+    }
+
+    public String getGoodsCompute() {
+        return goodsCompute;
+    }
+
+    public void setGoodsCompute(String goodsCompute) {
+        this.goodsCompute = goodsCompute;
+    }
+
+    public Integer getGoodsScore() {
+        return goodsScore;
+    }
+
+    public void setGoodsScore(Integer goodsScore) {
+        this.goodsScore = goodsScore;
+    }
+
+    public Integer getStoreType() {
+        return storeType;
+    }
+
+    public void setStoreType(Integer storeType) {
+        this.storeType = storeType;
+    }
+
+    public String getStoreCompute() {
+        return storeCompute;
+    }
+
+    public void setStoreCompute(String storeCompute) {
+        this.storeCompute = storeCompute;
+    }
+
+    public Integer getStoreScore() {
+        return storeScore;
+    }
+
+    public void setStoreScore(Integer storeScore) {
+        this.storeScore = storeScore;
+    }
+
+    public Integer getServiceType() {
+        return serviceType;
+    }
+
+    public void setServiceType(Integer serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    public String getServiceCompute() {
+        return serviceCompute;
+    }
+
+    public void setServiceCompute(String serviceCompute) {
+        this.serviceCompute = serviceCompute;
+    }
+
+    public Integer getServiceScore() {
+        return serviceScore;
+    }
+
+    public void setServiceScore(Integer serviceScore) {
+        this.serviceScore = serviceScore;
+    }
+
+    public Integer getReplyStatus() {
+        return replyStatus;
+    }
+
+    public void setReplyStatus(Integer replyStatus) {
+        this.replyStatus = replyStatus;
     }
 
-    public Integer getRoleId() {
-        return roleId;
+    public Integer getVisitStatus() {
+        return visitStatus;
     }
 
-    public void setRoleId(Integer roleId) {
-        this.roleId = roleId;
+    public void setVisitStatus(Integer visitStatus) {
+        this.visitStatus = visitStatus;
     }
 
-    public Integer getResourceId() {
-        return resourceId;
+    public Integer getShowStatus() {
+        return showStatus;
     }
 
-    public void setResourceId(Integer resourceId) {
-        this.resourceId = resourceId;
+    public void setShowStatus(Integer showStatus) {
+        this.showStatus = showStatus;
     }
 
-    public Integer getAccountGroupId() {
-        return accountGroupId;
+    public Integer getOrderByField() {
+        return orderByField;
     }
 
-    public void setAccountGroupId(Integer accountGroupId) {
-        this.accountGroupId = accountGroupId;
+    public void setOrderByField(Integer orderByField) {
+        this.orderByField = orderByField;
     }
 
-    public List<Integer> getUserIdList() {
-        return userIdList;
+    public Integer getOrderByType() {
+        return orderByType;
     }
 
-    public void setUserIdList(List<Integer> userIdList) {
-        this.userIdList = userIdList;
+    public void setOrderByType(Integer orderByType) {
+        this.orderByType = orderByType;
     }
 }

gic-evaluate-api/src/main/java/com/gic/evaluate/service/EvaluateHaobanApiService.java

+package com.gic.evaluate.service;
+
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.evaluate.dto.EvaluateDTO;
+import com.gic.evaluate.dto.MemberReplyDTO;
+import com.gic.evaluate.qo.EvaluateQO;
+
+/**
+ * 评价管理好办接口
+ * @Description:
+ * @author zhiwj
+ * @date 2019-12-27 9:20
+ */
+public interface EvaluateHaobanApiService {
+
+    /**
+     * 同步评价
+     * @Title: saveEvaluate
+     * @Description:
+     * @author zhiwj
+     * @param evaluateDTO
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     * @throws
+     */
+    ServiceResponse<Void> saveEvaluate(EvaluateDTO evaluateDTO);
+
+    /**
+     * 会员追评
+     * @Title: saveReview
+     * @Description:
+     * @author zhiwj
+     * @param memberReplyDTO
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     * @throws
+     */
+    ServiceResponse<Void> saveReply(MemberReplyDTO memberReplyDTO);
+
+    /**
+     * 查询门店下的所有评价（仅包含展示的）
+     * @Title: listEvaluateByStore
+     * @Description:
+     * @author zhiwj
+     * @param evaluateQO
+     * @return com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.evaluate.dto.EvaluateDTO>>
+     * @throws
+     */
+    ServiceResponse<Page<EvaluateDTO>> listEvaluateByStore(EvaluateQO evaluateQO);
+
+    /**
+     * 查询会员提的所有评价（包含 展示和未展示）
+     * @Title: listEvaluateByMember
+     * @Description:
+     * @author zhiwj
+     * @param evaluateQO
+     * @return com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.evaluate.dto.EvaluateDTO>>
+     * @throws
+     */
+    ServiceResponse<Page<EvaluateDTO>> listEvaluateByMember(EvaluateQO evaluateQO);
+
+
+}

gic-evaluate-api/src/main/java/com/gic/evaluate/service/EvaluateManageApiService.java

+package com.gic.evaluate.service;
+
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.evaluate.dto.EvaluateDTO;
+import com.gic.evaluate.dto.UserReplyDTO;
+import com.gic.evaluate.qo.EvaluateQO;
+
+import java.util.List;
+
+/**
+ * 后台评价管理服务
+ * @Description:
+ * @author zhiwj
+ * @date 2019-12-26 17:54
+ */
+public interface EvaluateManageApiService {
+
+    /**
+     * 后台页面的查询
+     * @Title: listEvaluate
+     * @Description: 
+     * @author zhiwj 
+     * @param evaluateQO
+     * @return com.gic.api.base.commons.ServiceResponse<com.gic.evaluate.dto.EvaluateDTO>
+     * @throws 
+     */
+    ServiceResponse<Page<EvaluateDTO>> listEvaluateForManage(EvaluateQO evaluateQO);
+
+    /**
+     * 查评价详情
+     * @Title: getEvaluate
+     * @Description:
+     * @author zhiwj
+     * @param evaluateId
+     * @return com.gic.api.base.commons.ServiceResponse<com.gic.evaluate.dto.EvaluateDTO>
+     * @throws
+     */
+    ServiceResponse<EvaluateDTO> getEvaluate(Integer enterpriseId, Integer evaluateId);
+
+    /**
+     * 修改展示状态
+     * @Title: updateShowStatus
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param evaluateId
+     * @param showStatus
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     * @throws
+     */
+    ServiceResponse<Void> updateShowStatus(Integer enterpriseId, List<Integer> evaluateId, Integer showStatus);
+
+    /**
+     * 修改是否为热评置顶
+     * @Title: updateTopHotStatus
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param evaluateId
+     * @param topHotStatus
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     * @throws
+     */
+    ServiceResponse<Void> updateTopHotStatus(Integer enterpriseId, Integer evaluateId, Integer topHotStatus);
+
+    /**
+     * 修改是否为恶评
+     * @Title: updateMaliciousStatus
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param evaluateId
+     * @param maliciousStatus
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     * @throws
+     */
+    ServiceResponse<Void> updateMaliciousStatus(Integer enterpriseId, Integer evaluateId, Integer maliciousStatus);
+
+    /**
+     * 管理员回复
+     * @Title: replyEvaluate
+     * @Description:
+     * @author zhiwj
+     * @param userReplyDTO
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     * @throws
+     */
+    ServiceResponse<Void> replyEvaluate(UserReplyDTO userReplyDTO);
+
+    /**
+     * 删除回复
+     * @Title: delReply
+     * @Description:
+     * @author zhiwj
+     * @param evaluateReplyId
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     * @throws
+     */
+    ServiceResponse<Void> delReply(Integer evaluateReplyId);
+
+}

gic-evaluate-api/src/main/java/com/gic/evaluate/service/EvaluateOverviewApiService.java

+package com.gic.evaluate.service;
+
+import com.gic.api.base.commons.ServiceResponse;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2019-12-27 15:51
+ */
+public interface EvaluateOverviewApiService {
+
+    /**
+     * 图表1
+     * @Title: chart1
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param startTime
+     * @param endTime
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     * @throws
+     */
+    ServiceResponse<Void> chart1(Integer enterpriseId, String startTime, String endTime);
+
+    /**
+     * 图表2
+     * @Title: chart2
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param startTime
+     * @param endTime
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     * @throws
+     */
+    ServiceResponse<Void> chart2(Integer enterpriseId, String startTime, String endTime);
+
+    /**
+     * 图表3
+     * @param enterpriseId
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    ServiceResponse<Void> chart3(Integer enterpriseId, String startTime, String endTime);
+
+    /**
+     * 图表4
+     * @param enterpriseId
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    ServiceResponse<Void> chart4(Integer enterpriseId, String startTime, String endTime);
+
+
+
+}

gic-evaluate-service/src/main/java/com/gic/evaluate/dao/mapper/TabEvaluateMapper.java

 package com.gic.evaluate.dao.mapper;
 
 import com.gic.evaluate.entity.TabEvaluate;
+import com.gic.evaluate.qo.EvaluateQO;
+import com.github.pagehelper.Page;
 
 public interface TabEvaluateMapper {
     /**
@@ -50,4 +52,6 @@ public interface TabEvaluateMapper {
      * @return 更新条目数
      */
     int updateByPrimaryKey(TabEvaluate record);
+
+    Page<TabEvaluate> listEvaluate(EvaluateQO evaluateQO);
 }
\ No newline at end of file

gic-evaluate-service/src/main/java/com/gic/evaluate/dao/mapper/TabEvaluateReplyMapper.java

 package com.gic.evaluate.dao.mapper;
 
 import com.gic.evaluate.entity.TabEvaluateReply;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface TabEvaluateReplyMapper {
     /**
@@ -50,4 +53,12 @@ public interface TabEvaluateReplyMapper {
      * @return 更新条目数
      */
     int updateByPrimaryKey(TabEvaluateReply record);
+
+    List<TabEvaluateReply> listEvaluateReply(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateId") Integer evaluateId);
+
+    void updateShowStatus(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateId") List<Integer> evaluateId, @Param("showStatus") Integer showStatus);
+
+    void updateTopHotStatus(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateId") Integer evaluateId, @Param("topHotStatus") Integer topHotStatus);
+
+    void updateMaliciousStatus(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateId") Integer evaluateId, @Param("maliciousStatus") Integer maliciousStatus);
 }
\ No newline at end of file

gic-evaluate-service/src/main/java/com/gic/evaluate/entity/TabEvaluateReply.java

@@ -22,9 +22,14 @@ public class TabEvaluateReply {
     private Integer evaluateId;
 
     /**
-     * 回复人
+     * 回复时间
      */
-    private Integer userId;
+    private Date replyDate;
+
+    /**
+     * 1:会员      2:店员
+     */
+    private Integer replyerType;
 
     /**
      * 回复内容
@@ -32,9 +37,24 @@ public class TabEvaluateReply {
     private String replyContent;
 
     /**
-     * 回复时间
+     * 
      */
-    private Date replyDate;
+    private Integer memberId;
+
+    /**
+     * 
+     */
+    private String memberName;
+
+    /**
+     * 
+     */
+    private Integer userId;
+
+    /**
+     * 
+     */
+    private String userName;
 
     /**
      * 
@@ -75,12 +95,20 @@ public class TabEvaluateReply {
         this.evaluateId = evaluateId;
     }
 
-    public Integer getUserId() {
-        return userId;
+    public Date getReplyDate() {
+        return replyDate;
     }
 
-    public void setUserId(Integer userId) {
-        this.userId = userId;
+    public void setReplyDate(Date replyDate) {
+        this.replyDate = replyDate;
+    }
+
+    public Integer getReplyerType() {
+        return replyerType;
+    }
+
+    public void setReplyerType(Integer replyerType) {
+        this.replyerType = replyerType;
     }
 
     public String getReplyContent() {
@@ -91,12 +119,36 @@ public class TabEvaluateReply {
         this.replyContent = replyContent;
     }
 
-    public Date getReplyDate() {
-        return replyDate;
+    public Integer getMemberId() {
+        return memberId;
     }
 
-    public void setReplyDate(Date replyDate) {
-        this.replyDate = replyDate;
+    public void setMemberId(Integer memberId) {
+        this.memberId = memberId;
+    }
+
+    public String getMemberName() {
+        return memberName;
+    }
+
+    public void setMemberName(String memberName) {
+        this.memberName = memberName;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
     }
 
     public Integer getStatus() {

gic-evaluate-service/src/main/java/com/gic/evaluate/service/EvaluateReplyService.java

+package com.gic.evaluate.service;
+
+import com.gic.evaluate.dto.MemberReplyDTO;
+import com.gic.evaluate.dto.UserReplyDTO;
+import com.gic.evaluate.entity.TabEvaluateReply;
+
+import java.util.List;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2019-12-27 9:52
+ */
+public interface EvaluateReplyService {
+    List<TabEvaluateReply> listEvaluateReply(Integer enterpriseId, Integer evaluateId);
+
+    void updateShowStatus(Integer enterpriseId, List<Integer> evaluateId, Integer showStatus);
+
+    void updateTopHotStatus(Integer enterpriseId, Integer evaluateId, Integer topHotStatus);
+
+    void updateMaliciousStatus(Integer enterpriseId, Integer evaluateId, Integer maliciousStatus);
+
+    void saveUserReplyEvaluate(UserReplyDTO userReplyDTO);
+
+    void saveMemberReplyEvaluate(MemberReplyDTO memberReplyDTO);
+
+    void delReply(Integer evaluateReplyId);
+}

gic-evaluate-service/src/main/java/com/gic/evaluate/service/EvaluateService.java

+package com.gic.evaluate.service;
+
+import com.gic.evaluate.dto.EvaluateDTO;
+import com.gic.evaluate.entity.TabEvaluate;
+import com.gic.evaluate.qo.EvaluateQO;
+import com.github.pagehelper.Page;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2019-12-27 9:51
+ */
+public interface EvaluateService {
+    Page<TabEvaluate> listEvaluate(EvaluateQO evaluateQO);
+
+    TabEvaluate getEvaluate(Integer enterpriseId, Integer evaluateId);
+
+    void saveEvaluate(EvaluateDTO evaluateDTO);
+}

gic-evaluate-service/src/main/java/com/gic/evaluate/service/impl/EvaluateReplyServiceImpl.java

+package com.gic.evaluate.service.impl;
+
+import com.gic.enterprise.constants.Constants;
+import com.gic.evaluate.constant.ReplyerTypeEnum;
+import com.gic.evaluate.dao.mapper.TabEvaluateReplyMapper;
+import com.gic.evaluate.dto.MemberReplyDTO;
+import com.gic.evaluate.dto.UserReplyDTO;
+import com.gic.evaluate.entity.TabEvaluateReply;
+import com.gic.evaluate.service.EvaluateReplyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2019-12-27 9:54
+ */
+@Service
+public class EvaluateReplyServiceImpl implements EvaluateReplyService {
+
+    @Autowired
+    private TabEvaluateReplyMapper tabEvaluateReplyMapper;
+
+    @Override
+    public List<TabEvaluateReply> listEvaluateReply(Integer enterpriseId, Integer evaluateId) {
+        return tabEvaluateReplyMapper.listEvaluateReply(enterpriseId, evaluateId);
+    }
+
+    @Override
+    public void updateShowStatus(Integer enterpriseId, List<Integer> evaluateId, Integer showStatus) {
+        tabEvaluateReplyMapper.updateShowStatus(enterpriseId, evaluateId, showStatus);
+    }
+
+    @Override
+    public void updateTopHotStatus(Integer enterpriseId, Integer evaluateId, Integer topHotStatus) {
+        tabEvaluateReplyMapper.updateTopHotStatus(enterpriseId, evaluateId, topHotStatus);
+    }
+
+    @Override
+    public void updateMaliciousStatus(Integer enterpriseId, Integer evaluateId, Integer maliciousStatus) {
+        tabEvaluateReplyMapper.updateMaliciousStatus(enterpriseId, evaluateId, maliciousStatus);
+    }
+
+    @Override
+    public void saveUserReplyEvaluate(UserReplyDTO userReplyDTO) {
+        TabEvaluateReply tabEvaluateReply = new TabEvaluateReply();
+        tabEvaluateReply.setEnterpriseId(userReplyDTO.getEnterpriseId());
+        tabEvaluateReply.setEvaluateId(userReplyDTO.getEvaluateId());
+        tabEvaluateReply.setReplyDate(new Date());
+        tabEvaluateReply.setReplyerType(ReplyerTypeEnum.USER.getCode());
+        tabEvaluateReply.setReplyContent(userReplyDTO.getReplyContent());
+        tabEvaluateReply.setUserId(userReplyDTO.getUserId());
+        tabEvaluateReply.setUserName(userReplyDTO.getUserName());
+        tabEvaluateReply.setStatus(Constants.NORMAL_STATUS);
+        tabEvaluateReply.setCreateTime(new Date());
+        tabEvaluateReplyMapper.insertSelective(tabEvaluateReply);
+    }
+
+    @Override
+    public void saveMemberReplyEvaluate(MemberReplyDTO memberReplyDTO) {
+        TabEvaluateReply tabEvaluateReply = new TabEvaluateReply();
+        tabEvaluateReply.setEnterpriseId(memberReplyDTO.getEnterpriseId());
+        tabEvaluateReply.setEvaluateId(memberReplyDTO.getEvaluateId());
+        tabEvaluateReply.setReplyDate(new Date());
+        tabEvaluateReply.setReplyerType(ReplyerTypeEnum.MEMBER.getCode());
+        tabEvaluateReply.setReplyContent(memberReplyDTO.getReplyContent());
+        tabEvaluateReply.setMemberId(memberReplyDTO.getMemberId());
+        tabEvaluateReply.setMemberName(memberReplyDTO.getMemberName());
+        tabEvaluateReply.setStatus(Constants.NORMAL_STATUS);
+        tabEvaluateReply.setCreateTime(new Date());
+        tabEvaluateReplyMapper.insertSelective(tabEvaluateReply);
+    }
+
+    @Override
+    public void delReply(Integer evaluateReplyId) {
+        TabEvaluateReply tabEvaluateReply = new TabEvaluateReply();
+        tabEvaluateReply.setEvaluateReplyId(evaluateReplyId);
+        tabEvaluateReply.setStatus(Constants.DEL_STATUS);
+        tabEvaluateReplyMapper.updateByPrimaryKeySelective(tabEvaluateReply);
+    }
+}

gic-evaluate-service/src/main/java/com/gic/evaluate/service/impl/EvaluateServiceImpl.java

+package com.gic.evaluate.service.impl;
+
+import com.gic.commons.util.EntityUtil;
+import com.gic.enterprise.constants.Constants;
+import com.gic.evaluate.constant.ComputeEnum;
+import com.gic.evaluate.dao.mapper.TabEvaluateMapper;
+import com.gic.evaluate.dto.EvaluateDTO;
+import com.gic.evaluate.entity.TabEvaluate;
+import com.gic.evaluate.qo.EvaluateQO;
+import com.gic.evaluate.service.EvaluateService;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2019-12-27 9:54
+ */
+@Service
+public class EvaluateServiceImpl implements EvaluateService {
+
+    @Autowired
+    private TabEvaluateMapper tabEvaluateMapper;
+
+    @Override
+    public Page<TabEvaluate> listEvaluate(EvaluateQO evaluateQO) {
+        if (evaluateQO.getGoodsType() != null) {
+            evaluateQO.setGoodsCompute(ComputeEnum.parseCodeToCompute(evaluateQO.getGoodsType()));
+        }
+        if (evaluateQO.getStoreType() != null) {
+            evaluateQO.setStoreCompute(ComputeEnum.parseCodeToCompute(evaluateQO.getStoreType()));
+        }
+        if (evaluateQO.getServiceType() != null) {
+            evaluateQO.setServiceCompute(ComputeEnum.parseCodeToCompute(evaluateQO.getServiceType()));
+        }
+        PageHelper.startPage(evaluateQO.getCurrentPage(), evaluateQO.getPageSize());
+        return tabEvaluateMapper.listEvaluate(evaluateQO);
+    }
+
+    @Override
+    public TabEvaluate getEvaluate(Integer enterpriseId, Integer evaluateId) {
+        TabEvaluate evaluate = this.tabEvaluateMapper.selectByPrimaryKey(evaluateId);
+        if (evaluate != null && Constants.NORMAL_STATUS.equals(evaluate.getStatus()) && evaluate.getEnterpriseId().equals(enterpriseId)) {
+            return evaluate;
+        }
+        return null;
+    }
+
+    @Override
+    public void saveEvaluate(EvaluateDTO evaluateDTO) {
+        TabEvaluate evaluate = EntityUtil.changeEntityByJSON(TabEvaluate.class, evaluateDTO);
+        tabEvaluateMapper.insertSelective(evaluate);
+    }
+}

gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/EvaluateHanbanApiServiceImpl.java

+package com.gic.evaluate.service.outer.impl;
+
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.enterprise.response.EnterpriseServiceResponse;
+import com.gic.evaluate.dto.EvaluateDTO;
+import com.gic.evaluate.dto.MemberReplyDTO;
+import com.gic.evaluate.qo.EvaluateQO;
+import com.gic.evaluate.service.EvaluateHaobanApiService;
+import com.gic.evaluate.service.EvaluateReplyService;
+import com.gic.evaluate.service.EvaluateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2019-12-27 15:27
+ */
+@Service("evaluateHaobanApiService")
+public class EvaluateHanbanApiServiceImpl implements EvaluateHaobanApiService {
+
+    @Autowired
+    private EvaluateService evaluateService;
+    @Autowired
+    private EvaluateReplyService evaluateReplyService;
+
+    @Override
+    public ServiceResponse<Void> saveEvaluate(EvaluateDTO evaluateDTO) {
+        evaluateService.saveEvaluate(evaluateDTO);
+        return EnterpriseServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<Void> saveReply(MemberReplyDTO memberReplyDTO) {
+        evaluateReplyService.saveMemberReplyEvaluate(memberReplyDTO);
+        return EnterpriseServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<Page<EvaluateDTO>> listEvaluateByStore(EvaluateQO evaluateQO) {
+        // todo 看到图在写
+        return null;
+    }
+
+    @Override
+    public ServiceResponse<Page<EvaluateDTO>> listEvaluateByMember(EvaluateQO evaluateQO) {
+        // todo 看到图在写
+        return null;
+    }
+}

gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/EvaluateManageApiServiceImpl.java

+package com.gic.evaluate.service.outer.impl;
+
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.EntityUtil;
+import com.gic.commons.util.PageHelperUtils;
+import com.gic.enterprise.error.ErrorCode;
+import com.gic.enterprise.response.EnterpriseServiceResponse;
+import com.gic.evaluate.dto.EvaluateDTO;
+import com.gic.evaluate.dto.EvaluateReplyDTO;
+import com.gic.evaluate.dto.UserReplyDTO;
+import com.gic.evaluate.entity.TabEvaluate;
+import com.gic.evaluate.entity.TabEvaluateReply;
+import com.gic.evaluate.qo.EvaluateQO;
+import com.gic.evaluate.service.EvaluateManageApiService;
+import com.gic.evaluate.service.EvaluateReplyService;
+import com.gic.evaluate.service.EvaluateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2019-12-27 9:50
+ */
+@Service("evaluateManageApiService")
+public class EvaluateManageApiServiceImpl implements EvaluateManageApiService {
+
+    @Autowired
+    private EvaluateService evaluateService;
+    @Autowired
+    private EvaluateReplyService evaluateReplyService;
+
+    @Override
+    public ServiceResponse<Page<EvaluateDTO>> listEvaluateForManage(EvaluateQO evaluateQO) {
+        com.github.pagehelper.Page<TabEvaluate> evaluateList = evaluateService.listEvaluate(evaluateQO);
+        Page<EvaluateDTO> page = PageHelperUtils.changePageHelperToCurrentPage(evaluateList, EvaluateDTO.class);
+        return EnterpriseServiceResponse.success(page);
+    }
+
+    @Override
+    public ServiceResponse<EvaluateDTO> getEvaluate(Integer enterpriseId, Integer evaluateId) {
+        TabEvaluate evaluate = evaluateService.getEvaluate(enterpriseId, evaluateId);
+        if (evaluate == null) {
+            return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS);
+        }
+        EvaluateDTO evaluateDTO = EntityUtil.changeEntityByJSON(EvaluateDTO.class, evaluate);
+        List<TabEvaluateReply> tabReplyList = evaluateReplyService.listEvaluateReply(enterpriseId, evaluateId);
+        List<EvaluateReplyDTO> replyDTOList = EntityUtil.changeEntityListByJSON(EvaluateReplyDTO.class, tabReplyList);
+        evaluateDTO.setReplyList(replyDTOList);
+        return EnterpriseServiceResponse.success(evaluateDTO);
+    }
+
+    @Override
+    public ServiceResponse<Void> updateShowStatus(Integer enterpriseId, List<Integer> evaluateId, Integer showStatus) {
+        this.evaluateReplyService.updateShowStatus(enterpriseId, evaluateId, showStatus);
+        return EnterpriseServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<Void> updateTopHotStatus(Integer enterpriseId, Integer evaluateId, Integer topHotStatus) {
+        this.evaluateReplyService.updateTopHotStatus(enterpriseId, evaluateId, topHotStatus);
+        return EnterpriseServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<Void> updateMaliciousStatus(Integer enterpriseId, Integer evaluateId, Integer maliciousStatus) {
+        this.evaluateReplyService.updateMaliciousStatus(enterpriseId, evaluateId, maliciousStatus);
+        this.evaluateReplyService.updateShowStatus(enterpriseId, Collections.singletonList(evaluateId), maliciousStatus);
+        return EnterpriseServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<Void> replyEvaluate(UserReplyDTO userReplyDTO) {
+        this.evaluateReplyService.saveUserReplyEvaluate(userReplyDTO);
+        return EnterpriseServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<Void> delReply(Integer evaluateReplyId) {
+        this.evaluateReplyService.delReply(evaluateReplyId);
+        return EnterpriseServiceResponse.success();
+    }
+
+}

gic-evaluate-service/src/main/resources/mapper/TabEvaluateMapper.xml

@@ -411,4 +411,81 @@
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where evaluate_id = #{evaluateId,jdbcType=INTEGER}
   </update>
+  <select id="listEvaluate" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_evaluate
+    <where>
+      <if test="enterpriseId != null ">
+          and enterprise_id = #{enterpriseId}
+      </if>
+      <if test="search != null and search != '' ">
+        and ( order_number like concat('%', #{search}, '%')
+            or member_name like concat('%', #{search}, '%')
+            or member_phone like concat('%', #{search}, '%')
+            or evaluate_content like concat('%', #{search}, '%')
+            or store_name like concat('%', #{search}, '%')
+        )
+      </if>
+      <if test="startTime != null ">
+          and evaluate_time &gt;= #{startTime}
+      </if>
+      <if test="endTime != null ">
+          and evaluate_time &lt;= #{endTime}
+      </if>
+      and ( 1=1
+        <if test="badEvaluateStatus != null ">
+            or bad_evaluate_status = #{badEvaluateStatus}
+        </if>
+        <if test="goodEvaluateStatus != null ">
+            or good_evaluate_status = #{goodEvaluateStatus}
+        </if>
+        <if test="reviewStatus != null ">
+            or review_status = #{reviewStatus}
+        </if>
+        <if test="topHotStatus != null ">
+            or top_hot_status = #{topHotStatus}
+        </if>
+        <if test="maliciousStatus != null ">
+            or malicious_status = #{maliciousStatus}
+        </if>
+        or ( 1=1
+        <if test="goodsCompute != null and goodsCompute != '' and goodsScore != null ">
+            and goods_score ${goodsCompute} #{goodsScore}
+        </if>
+        <if test="storeCompute != null and storeCompute != '' and storeScore != null ">
+            and store_score ${storeCompute} #{storeScore}
+        </if>
+        <if test="serviceCompute != null and serviceCompute != '' and serviceScore != null ">
+            and service_score ${serviceCompute} #{serviceScore}
+        </if>
+        )
+      )
+      <if test="replyStatus != null ">
+          and reply_status = #{replyStatus}
+      </if>
+      <if test="visitStatus != null ">
+          and visit_status = #{visitStatus}
+      </if>
+      <if test="showStatus != null ">
+          and show_status = #{showStatus}
+      </if>
+    </where>
+    <if test="orderByField != null ">
+        <if test="orderByField == 1 ">
+            order by evaluate_time
+        </if>
+        <if test="orderByField == 2 ">
+            order by receipts_date
+        </if>
+        <if test="orderByType != null ">
+            <if test="orderByType == 1 ">
+            asc
+            </if>
+            <if test="orderByType == 2 ">
+            desc
+            </if>
+        </if>
+    </if>
+  </select>
 </mapper>
\ No newline at end of file

gic-evaluate-service/src/main/resources/mapper/TabEvaluateReplyMapper.xml

@@ -5,16 +5,20 @@
     <id column="evaluate_reply_id" jdbcType="INTEGER" property="evaluateReplyId" />
     <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
     <result column="evaluate_id" jdbcType="INTEGER" property="evaluateId" />
-    <result column="user_id" jdbcType="INTEGER" property="userId" />
-    <result column="reply_content" jdbcType="VARCHAR" property="replyContent" />
     <result column="reply_date" jdbcType="TIMESTAMP" property="replyDate" />
+    <result column="replyer_type" jdbcType="INTEGER" property="replyerType" />
+    <result column="reply_content" jdbcType="VARCHAR" property="replyContent" />
+    <result column="member_id" jdbcType="INTEGER" property="memberId" />
+    <result column="member_name" jdbcType="VARCHAR" property="memberName" />
+    <result column="user_id" jdbcType="INTEGER" property="userId" />
+    <result column="user_name" jdbcType="VARCHAR" property="userName" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    evaluate_reply_id, enterprise_id, evaluate_id, user_id, reply_content, reply_date, 
-    status, create_time, update_time
+    evaluate_reply_id, enterprise_id, evaluate_id, reply_date, replyer_type, reply_content, 
+    member_id, member_name, user_id, user_name, status, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -28,13 +32,15 @@
   </delete>
   <insert id="insert" parameterType="com.gic.evaluate.entity.TabEvaluateReply">
     insert into tab_evaluate_reply (evaluate_reply_id, enterprise_id, evaluate_id, 
-      user_id, reply_content, reply_date, 
-      status, create_time, update_time
-      )
+      reply_date, replyer_type, reply_content, 
+      member_id, member_name, user_id, 
+      user_name, status, create_time, 
+      update_time)
     values (#{evaluateReplyId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{evaluateId,jdbcType=INTEGER}, 
-      #{userId,jdbcType=INTEGER}, #{replyContent,jdbcType=VARCHAR}, #{replyDate,jdbcType=TIMESTAMP}, 
-      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
-      )
+      #{replyDate,jdbcType=TIMESTAMP}, #{replyerType,jdbcType=INTEGER}, #{replyContent,jdbcType=VARCHAR}, 
+      #{memberId,jdbcType=INTEGER}, #{memberName,jdbcType=VARCHAR}, #{userId,jdbcType=INTEGER}, 
+      #{userName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.evaluate.entity.TabEvaluateReply">
     insert into tab_evaluate_reply
@@ -48,14 +54,26 @@
       <if test="evaluateId != null">
         evaluate_id,
       </if>
-      <if test="userId != null">
-        user_id,
+      <if test="replyDate != null">
+        reply_date,
+      </if>
+      <if test="replyerType != null">
+        replyer_type,
       </if>
       <if test="replyContent != null">
         reply_content,
       </if>
-      <if test="replyDate != null">
-        reply_date,
+      <if test="memberId != null">
+        member_id,
+      </if>
+      <if test="memberName != null">
+        member_name,
+      </if>
+      <if test="userId != null">
+        user_id,
+      </if>
+      <if test="userName != null">
+        user_name,
       </if>
       <if test="status != null">
         status,
@@ -77,14 +95,26 @@
       <if test="evaluateId != null">
         #{evaluateId,jdbcType=INTEGER},
       </if>
-      <if test="userId != null">
-        #{userId,jdbcType=INTEGER},
+      <if test="replyDate != null">
+        #{replyDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="replyerType != null">
+        #{replyerType,jdbcType=INTEGER},
       </if>
       <if test="replyContent != null">
         #{replyContent,jdbcType=VARCHAR},
       </if>
-      <if test="replyDate != null">
-        #{replyDate,jdbcType=TIMESTAMP},
+      <if test="memberId != null">
+        #{memberId,jdbcType=INTEGER},
+      </if>
+      <if test="memberName != null">
+        #{memberName,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null">
+        #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="userName != null">
+        #{userName,jdbcType=VARCHAR},
       </if>
       <if test="status != null">
         #{status,jdbcType=INTEGER},
@@ -106,14 +136,26 @@
       <if test="evaluateId != null">
         evaluate_id = #{evaluateId,jdbcType=INTEGER},
       </if>
-      <if test="userId != null">
-        user_id = #{userId,jdbcType=INTEGER},
+      <if test="replyDate != null">
+        reply_date = #{replyDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="replyerType != null">
+        replyer_type = #{replyerType,jdbcType=INTEGER},
       </if>
       <if test="replyContent != null">
         reply_content = #{replyContent,jdbcType=VARCHAR},
       </if>
-      <if test="replyDate != null">
-        reply_date = #{replyDate,jdbcType=TIMESTAMP},
+      <if test="memberId != null">
+        member_id = #{memberId,jdbcType=INTEGER},
+      </if>
+      <if test="memberName != null">
+        member_name = #{memberName,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null">
+        user_id = #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="userName != null">
+        user_name = #{userName,jdbcType=VARCHAR},
       </if>
       <if test="status != null">
         status = #{status,jdbcType=INTEGER},
@@ -131,12 +173,39 @@
     update tab_evaluate_reply
     set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
       evaluate_id = #{evaluateId,jdbcType=INTEGER},
-      user_id = #{userId,jdbcType=INTEGER},
-      reply_content = #{replyContent,jdbcType=VARCHAR},
       reply_date = #{replyDate,jdbcType=TIMESTAMP},
+      replyer_type = #{replyerType,jdbcType=INTEGER},
+      reply_content = #{replyContent,jdbcType=VARCHAR},
+      member_id = #{memberId,jdbcType=INTEGER},
+      member_name = #{memberName,jdbcType=VARCHAR},
+      user_id = #{userId,jdbcType=INTEGER},
+      user_name = #{userName,jdbcType=VARCHAR},
       status = #{status,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where evaluate_reply_id = #{evaluateReplyId,jdbcType=INTEGER}
   </update>
+  <select id="listEvaluateReply" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_evaluate_reply
+    where enterprise_id = #{enterpriseId}
+    and evaluate_id = #{evaluateId}
+  </select>
+  <update id="updateShowStatus">
+    update tab_evaluate_reply set show_status = #{showStatus} where enterprise_id = #{enterpriseId}
+    <if test="null != ids and evaluateId.size > 0">
+      and evaluate_id in
+      <foreach collection="evaluateId" index="index" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
+  </update>
+  <update id="updateTopHotStatus">
+    update tab_evaluate_reply set top_hot_status = #{showStatus} where enterprise_id = #{enterpriseId} and evaluate_id = #{evaluateId}
+  </update>
+  <update id="updateMaliciousStatus">
+    update tab_evaluate_reply set malicious_status = #{maliciousStatus} where enterprise_id = #{enterpriseId} and evaluate_id = #{evaluateId}
+  </update>
+
 </mapper>
\ No newline at end of file