小程序端接口

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

+package com.gic.evaluate.constant;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2020/2/4 17:07
+ */
+public enum OrderReplyEnum {
+    // 待处理
+    WAIT(0),
+    // 已回复
+    REPLIED(1),
+    // 有新的追评
+    HAS_NEW(2),
+    // 评价逾期
+    EVALUATE_OVERDUE(3),
+    // 不支持追评
+    REPLY_NOT_SUPPORT(4),
+    // 追评逾期 不可回复
+    REPLY_OVERDUE(5),
+    // 追评超过最大数量
+    REPLY_OVER_MAX_TIMES(6),
+    ;
+
+    private Integer code;
+
+    OrderReplyEnum(Integer code) {
+        this.code = code;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+}

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

@@ -6,12 +6,12 @@ package com.gic.evaluate.constant;
  * @date 2020-01-02 15:25
  */
 public enum ReplyEnum {
-    //
+    // 待处理
     WAIT(0),
-    //,
+    // 已回复
     REPLIED(1),
-    //
-    HAS_NEW(2)
+    // 有新的追评
+    HAS_NEW(2),
     ;
 
     private Integer code;

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

@@ -34,6 +34,16 @@ public class EvaluateDTO implements Serializable {
     private Long memberId;
 
     /**
+     * acuId
+     */
+    private Long acuId;
+
+    /**
+     * ecuId
+     */
+    private Long ecuId;
+
+    /**
      * 订单id
      */
     private Long orderId;
@@ -197,6 +207,7 @@ public class EvaluateDTO implements Serializable {
     private String replyTime;
     private String replyMemberContent;
     private String replyUserContent;
+    private List<String> imgList;
 
     public Integer getEvaluateId() {
         return evaluateId;
@@ -230,6 +241,14 @@ public class EvaluateDTO implements Serializable {
         this.memberId = memberId;
     }
 
+    public Long getAcuId() {
+        return acuId;
+    }
+
+    public void setAcuId(Long acuId) {
+        this.acuId = acuId;
+    }
+
     public Long getOrderId() {
         return orderId;
     }
@@ -529,4 +548,21 @@ public class EvaluateDTO implements Serializable {
     public boolean isHasTopHot() {
         return hasTopHot;
     }
+
+    public void setImgList(List<String> imgList) {
+        this.imgList = imgList;
+    }
+
+    public List<String> getImgList() {
+        return imgList;
+    }
+
+    public Long getEcuId() {
+        return ecuId;
+    }
+
+    public void setEcuId(Long ecuId) {
+        this.ecuId = ecuId;
+    }
 }
+

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

 package com.gic.evaluate.dto;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 会员回复
@@ -35,6 +36,10 @@ public class MemberReplyDTO implements Serializable {
      *
      */
     private String memberName;
+    private List<String> imgList;
+    private String memberImgUrl;
+    private Long acuId;
+    private Long ecuId;
 
     public Integer getEnterpriseId() {
         return enterpriseId;
@@ -75,4 +80,36 @@ public class MemberReplyDTO implements Serializable {
     public void setMemberName(String memberName) {
         this.memberName = memberName;
     }
+
+    public List<String> getImgList() {
+        return imgList;
+    }
+
+    public void setImgList(List<String> imgList) {
+        this.imgList = imgList;
+    }
+
+    public String getMemberImgUrl() {
+        return memberImgUrl;
+    }
+
+    public void setMemberImgUrl(String memberImgUrl) {
+        this.memberImgUrl = memberImgUrl;
+    }
+
+    public Long getAcuId() {
+        return acuId;
+    }
+
+    public void setAcuId(Long acuId) {
+        this.acuId = acuId;
+    }
+
+    public Long getEcuId() {
+        return ecuId;
+    }
+
+    public void setEcuId(Long ecuId) {
+        this.ecuId = ecuId;
+    }
 }

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

+package com.gic.evaluate.qo;
+
+import java.io.Serializable;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2020/2/4 9:09
+ */
+public class EvaluateOutQO implements Serializable {
+    private static final long serialVersionUID = 3863482060139969653L;
+
+    private Integer enterpriseId;
+
+    /**
+     * mcuId
+     */
+    private Long memberId;
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Long getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(Long memberId) {
+        this.memberId = memberId;
+    }
+
+}

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

@@ -96,6 +96,7 @@ public class EvaluateQO extends PageQO{
     private List<Integer> storeIdList;
 
     private Integer[] evaluateIds;
+    private Long memberId;
 
     public Integer getEnterpriseId() {
         return enterpriseId;
@@ -304,4 +305,12 @@ public class EvaluateQO extends PageQO{
     public void setEvaluateIds(Integer[] evaluateIds) {
         this.evaluateIds = evaluateIds;
     }
+
+    public void setMemberId(Long memberId) {
+        this.memberId = memberId;
+    }
+
+    public Long getMemberId() {
+        return memberId;
+    }
 }

gic-evaluate-api/src/main/java/com/gic/evaluate/service/EvaluateOutApiService.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;
+import com.gic.evaluate.qo.EvaluateOutQO;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 评价管理好办接口
@@ -41,22 +43,31 @@ public interface EvaluateOutApiService {
      * @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);
+//    ServiceResponse<Page<EvaluateDTO>> listEvaluateByStore(EvaluateOutQO evaluateOutQO);
 
     /**
      * 查询会员提的所有评价（包含 展示和未展示）
      * @Title: listEvaluateByMember
      * @Description:
      * @author zhiwj
-     * @param evaluateQO
+     * @param evaluateOutQO
      * @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);
-
+    ServiceResponse<List<EvaluateDTO>> listEvaluateByMember(EvaluateOutQO evaluateOutQO);
 
+    /**
+     * 查询订单号对应的回复状态 key是订单号， value是状态（-1:未评价  0管理员没有回复过  1管理员回复了   2有新的追评管理员没回复   3不支持追评    4超过评价期限   5超过最大追评次数 ）
+     * @Title: queryRelayStatusByOrderNumbers
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param orderNumberList
+     * @return com.gic.api.base.commons.ServiceResponse<java.util.Map<java.lang.Long,java.lang.Integer>>
+     * @throws
+     */
+    ServiceResponse<Map<String, Integer>> queryRelayStatusByOrderNumbers(Integer enterpriseId, List<String> orderNumberList);
 }

gic-evaluate-service/pom.xml

@@ -113,6 +113,11 @@
             <artifactId>gic-member-api</artifactId>
             <version>${gic-member-api}</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-store-api</artifactId>
+            <version>${gic-store-api}</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -15,9 +15,9 @@ import java.util.List;
 public interface EvaluateReplyService {
     List<TabEvaluateReply> listEvaluateReply(Integer enterpriseId, Integer evaluateId);
 
-    void saveUserReplyEvaluate(UserReplyDTO userReplyDTO);
+    Integer saveUserReplyEvaluate(UserReplyDTO userReplyDTO);
 
-    int saveMemberReplyEvaluate(MemberReplyDTO memberReplyDTO);
+    Integer saveMemberReplyEvaluate(MemberReplyDTO memberReplyDTO);
 
     void delReply(Integer evaluateReplyId);
 

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

@@ -25,7 +25,7 @@ public interface EvaluateService {
 
     TabEvaluate getEvaluate(Integer enterpriseId, Integer evaluateId);
 
-    void saveEvaluate(EvaluateDTO evaluateDTO);
+    Integer saveEvaluate(EvaluateDTO evaluateDTO);
 
     void updateShowStatus(Integer enterpriseId, List<Integer> evaluateId, Integer showStatus);
 

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

@@ -31,7 +31,7 @@ public class EvaluateReplyServiceImpl implements EvaluateReplyService {
     }
 
     @Override
-    public void saveUserReplyEvaluate(UserReplyDTO userReplyDTO) {
+    public Integer saveUserReplyEvaluate(UserReplyDTO userReplyDTO) {
         TabEvaluateReply tabEvaluateReply = new TabEvaluateReply();
         tabEvaluateReply.setEnterpriseId(userReplyDTO.getEnterpriseId());
         tabEvaluateReply.setEvaluateId(userReplyDTO.getEvaluateId());
@@ -43,10 +43,11 @@ public class EvaluateReplyServiceImpl implements EvaluateReplyService {
         tabEvaluateReply.setStatus(Constants.NORMAL_STATUS);
         tabEvaluateReply.setCreateTime(new Date());
         tabEvaluateReplyMapper.insertSelective(tabEvaluateReply);
+        return tabEvaluateReply.getEvaluateReplyId();
     }
 
     @Override
-    public int saveMemberReplyEvaluate(MemberReplyDTO memberReplyDTO) {
+    public Integer saveMemberReplyEvaluate(MemberReplyDTO memberReplyDTO) {
         TabEvaluateReply tabEvaluateReply = new TabEvaluateReply();
         tabEvaluateReply.setEnterpriseId(memberReplyDTO.getEnterpriseId());
         tabEvaluateReply.setEvaluateId(memberReplyDTO.getEvaluateId());
@@ -55,9 +56,11 @@ public class EvaluateReplyServiceImpl implements EvaluateReplyService {
         tabEvaluateReply.setReplyContent(memberReplyDTO.getReplyContent());
         tabEvaluateReply.setMemberId(memberReplyDTO.getMemberId());
         tabEvaluateReply.setMemberName(memberReplyDTO.getMemberName());
+        tabEvaluateReply.setMemberImgUrl(memberReplyDTO.getMemberImgUrl());
         tabEvaluateReply.setStatus(Constants.NORMAL_STATUS);
         tabEvaluateReply.setCreateTime(new Date());
-        return tabEvaluateReplyMapper.insertSelective(tabEvaluateReply);
+        tabEvaluateReplyMapper.insertSelective(tabEvaluateReply);
+        return tabEvaluateReply.getEvaluateReplyId();
     }
 
     @Override

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

@@ -76,11 +76,14 @@ public class EvaluateServiceImpl implements EvaluateService {
     }
 
     @Override
-    public void saveEvaluate(EvaluateDTO evaluateDTO) {
+    public Integer saveEvaluate(EvaluateDTO evaluateDTO) {
         TabEvaluate evaluate = EntityUtil.changeEntityByJSON(TabEvaluate.class, evaluateDTO);
         evaluate.setStatus(Constants.NORMAL_STATUS);
-        evaluate.setCreateTime(new Date());
+        Date date = new Date();
+        evaluate.setEvaluateTime(date);
+        evaluate.setCreateTime(date);
         tabEvaluateMapper.insertSelective(evaluate);
+        return evaluate.getEvaluateId();
     }
 
     @Override

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

@@ -7,6 +7,7 @@ import com.gic.commons.util.PageHelperUtils;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.response.EnterpriseServiceResponse;
 import com.gic.evaluate.constant.Constants;
+import com.gic.evaluate.constant.ReplyEnum;
 import com.gic.evaluate.dto.EvaluateDTO;
 import com.gic.evaluate.dto.EvaluateQuickDTO;
 import com.gic.evaluate.dto.EvaluateReplyDTO;
@@ -129,7 +130,7 @@ public class EvaluateManageApiServiceImpl implements EvaluateManageApiService {
                 this.evaluateReplyService.saveUserReplyEvaluate(userReplyDTO);
                 EvaluateDTO evaluateDTO = new EvaluateDTO();
                 evaluateDTO.setEvaluateId(evaluateId);
-                evaluateDTO.setReplyStatus(Constants.CLOSE);
+                evaluateDTO.setReplyStatus(ReplyEnum.REPLIED.getCode());
                 this.evaluateService.updateEvaluate(evaluateDTO);
             }
         }

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

@@ -17,7 +17,10 @@ import com.gic.member.api.dto.AcuDetailDTO;
 import com.gic.member.api.dto.MemberUserDTO;
 import com.gic.member.api.service.CuDetailService;
 import com.gic.member.api.service.MemberUserApiService;
+import com.gic.store.dto.StoreDTO;
+import com.gic.store.service.StoreApiService;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +55,8 @@ public class ProblemOutApiServiceImpl implements ProblemOutApiService {
     private EvaluateOrderConfigService evaluateOrderConfigService;
     @Autowired
     private CuDetailService cuDetailService;
+    @Autowired
+    private StoreApiService storeApiService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -67,7 +72,13 @@ public class ProblemOutApiServiceImpl implements ProblemOutApiService {
             MemberUserDTO memberUserDTO = memberUserDTOServiceResponse.getResult();
             problemDTO.setMemberName(memberUserDTO.getName());
             problemDTO.setMemberPhone(memberUserDTO.getMobile());
-            // todo 门店
+            // 门店
+            String storeId = cuDetailService.getServiceStoreId(problemDTO.getAcuId(), problemDTO.getEnterpriseId(), problemDTO.getEcuId()).getResult();
+            if (StringUtils.isNotBlank(storeId)) {
+                StoreDTO storeDTO = storeApiService.getStoreById(memberUserDTO.getEnterpriseId(), Integer.valueOf(storeId)).getResult();
+                problemDTO.setStoreName(storeDTO.getStoreName());
+            }
+
             if (problemDTO.getAcuId() != null) {
                 ServiceResponse<AcuDetailDTO> acuDetailResponse = cuDetailService.getAcuDetail(problemDTO.getAcuId(), problemDTO.getEnterpriseId(), problemDTO.getEcuId());
                 if (acuDetailResponse.isSuccess() || acuDetailResponse.getResult() != null) {
@@ -97,7 +108,7 @@ public class ProblemOutApiServiceImpl implements ProblemOutApiService {
         List<String> imgUrlList = problemMemberReplyDTO.getImgList();
         ServiceResponse<MemberUserDTO> memberUserDTOServiceResponse = memberUserApiService.getByMcuId(problemMemberReplyDTO.getMemberId(), problemMemberReplyDTO.getEnterpriseId());
         if (memberUserDTOServiceResponse.isSuccess()) {
-            // todo 门店
+
             MemberUserDTO memberUserDTO = memberUserDTOServiceResponse.getResult();
             problemMemberReplyDTO.setMemberName(memberUserDTO.getName());
 
@@ -117,6 +128,7 @@ public class ProblemOutApiServiceImpl implements ProblemOutApiService {
         if (CollectionUtils.isNotEmpty(imgUrlList)) {
             problemImgService.saveList(problemMemberReplyDTO.getEnterpriseId(), problemMemberReplyDTO.getProblemId(), problemReplyId, imgUrlList);
         }
+
         return EnterpriseServiceResponse.success();
     }
 

gic-evaluate-service/src/main/resources/dubbo-gic-evaluate-service.xml

@@ -22,6 +22,7 @@
     <dubbo:service interface="com.gic.evaluate.service.ProblemManageApiService" ref="problemManageApiService" timeout="6000" />
     <dubbo:reference interface="com.gic.member.api.service.MemberUserApiService" id="memberUserApiService" timeout="6000" />
     <dubbo:reference interface="com.gic.member.api.service.CuDetailService" id="cuDetailService" timeout="6000" />
+    <dubbo:reference interface="com.gic.store.service.StoreApiService" id="storeApiService" timeout="6000" />
 
 <!--    <dubbo:reference interface="com.gic.log.api.service.LogApiService" id="logApiService" timeout="6000" />-->
 

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

@@ -116,6 +116,9 @@
       <if test="showStatus != null ">
         and show_status = #{showStatus}
       </if>
+      <if test="memberId != null">
+        and member_id = #{memberId}
+      </if>
     </where>
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -157,6 +160,9 @@
       #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.evaluate.entity.TabEvaluate">
+    <selectKey keyProperty="evaluateId" order="AFTER" resultType="java.lang.Integer">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
     insert into tab_evaluate
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="evaluateId != null">

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

@@ -48,6 +48,9 @@
       )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.evaluate.entity.TabEvaluateReply">
+    <selectKey keyProperty="evaluateReplyId" order="AFTER" resultType="java.lang.Integer">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
     insert into tab_evaluate_reply
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="evaluateReplyId != null">