Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-evaluate into developer

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

@@ -159,7 +159,6 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
             MemberReplyDTO memberReplyDTO = new MemberReplyDTO();
             memberReplyDTO.setEvaluateId(evaluateId);
             memberReplyDTO.setEnterpriseId(evaluateDTO.getEnterpriseId());
-            memberReplyDTO.setEvaluateId(evaluateDTO.getEvaluateId());
             memberReplyDTO.setReplyContent(evaluateDTO.getEvaluateContent());
             memberReplyDTO.setMemberId(evaluateDTO.getMemberId());
             memberReplyDTO.setMemberName(evaluateDTO.getMemberName());

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

@@ -104,17 +104,23 @@
                     )
                 </if>
                 <if test="badEvaluateStatus == null and goodEvaluateStatus == null and reviewStatus == null and topHotStatus == null and maliciousStatus == null">
-                    1=1
+                    1=0
                 </if>
-                or ( 1=0
-                <if test="goodsCompute != null and goodsCompute != '' and goodsScore != null ">
-                    and goods_score ${goodsCompute} #{goodsScore}
+                or (
+                <if test="goodsCompute == null and storeCompute == null and serviceCompute == null">
+                  1=0
                 </if>
-                <if test="storeCompute != null and storeCompute != '' and storeScore != null ">
+                <if test="goodsCompute != null or storeCompute != null or serviceCompute != null">
+                    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 ">
+                  </if>
+                  <if test="serviceCompute != null and serviceCompute != '' and serviceScore != null ">
                     and service_score ${serviceCompute} #{serviceScore}
+                  </if>
                 </if>
                 )
                 )
@@ -593,7 +599,7 @@
       </if>
     </if>
     <if test="orderByField == null ">
-      order by evaluate_time desc
+      order by top_hot_status DESC, evaluate_time desc
     </if>
   </select>
   <select id="countEvaluate" resultType="int">

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

@@ -220,6 +220,7 @@
     where enterprise_id = #{enterpriseId}
     and evaluate_id = #{evaluateId}
     and status = 1
+    and show_status = 1
   </select>
   <update id="updateReplyShowStatus">
     update tab_evaluate_reply set show_status = #{showStatus} where enterprise_id = #{enterpriseId} and evaluate_reply_id = #{evaluateReplyId}