소스 검색

bug修改

zjy 20 시간 전
부모
커밋
9ee175039c

+ 8 - 0
alien-entity/src/main/java/shop/alien/entity/second/vo/SecondGoodsRecommendVo.java

@@ -1,5 +1,8 @@
 package shop.alien.entity.second.vo;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -47,6 +50,11 @@ public class SecondGoodsRecommendVo extends SecondGoods {
     @ApiModelProperty(value = "评论列表")
     private List<SecondCommentVo> commentList;
 
+    @TableField(value = "release_time", fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "发布时间")
+    private Date releaseTime;
+
     @ApiModelProperty(value = "话题列表")
     @JsonProperty("topicList")
     private List<String> topicList() {

+ 8 - 3
alien-entity/src/main/resources/mapper/second/SecondGoodsInfoMapper.xml

@@ -29,6 +29,8 @@
         <result column="isLike" property="isLike" jdbcType="VARCHAR"/>
         <result column="home_image" property="homeImage" jdbcType="VARCHAR"/>
         <result column="user_phone" property="userPhone" jdbcType="VARCHAR"/>
+        <result column="release_time" property="releaseTime" jdbcType="VARCHAR"/>
+
     </resultMap>
 
     <!-- 分页查询推荐数据 -->
@@ -62,6 +64,7 @@
             u.user_image,
             g.goods_status,
             g.delete_flag,
+            g.release_time,
             ROUND(ST_Distance_Sphere(ST_GeomFromText(CONCAT('POINT(', REPLACE(#{position}, ',', ' '), ')' )), ST_GeomFromText(CONCAT('POINT(', REPLACE(g.position, ',', ' '), ')' ))) / 1000, 2) AS dist,
             case when llr.id is null then '0' else '1' end likeStatus,
             g.home_image,
@@ -76,7 +79,7 @@
             and not exists (select 1 from shieldUser s where s.id = g.id)
             and not exists (select 1 from second_shield s where s.user_id = #{userId} and s.shield_type = 1 and s.shield_id = g.id and s.delete_flag = 0)
             and g.goods_status = 3
-        order by dist, like_count desc, created_time desc
+        order by dist, like_count desc, release_time desc
     </select>
 
     <!-- 分页查询关注数据concern -->
@@ -98,6 +101,7 @@
             g.created_user_id,
             g.updated_time,
             g.updated_user_id,
+            g.release_time,
             u.user_name,
             u.user_image,
             CONCAT('user_', u.user_phone) as user_phone,
@@ -118,7 +122,7 @@
             left join life_collect lc on lc.business_id = g.id and lc.user_id = #{phoneId} and lc.delete_flag = 0 and lc.business_type = 1
         where
             f.fans_id = #{phoneId} and f.delete_flag = 0
-        order by g.created_time desc
+        order by g.release_time desc
     </select>
 
     <select id="querySecondCommentInfo" resultType="shop.alien.entity.second.vo.SecondCommentVo">
@@ -174,6 +178,7 @@
             g.created_user_id,
             g.updated_time,
             g.updated_user_id,
+            g.release_time,
             u.user_name,
             u.user_image,
             CONCAT('user_', u.user_phone) as user_phone,
@@ -193,7 +198,7 @@
             and not exists (select 1 from shieldUser s where s.id = g.id)
             and not exists (select 1 from second_shield s where s.user_id = #{userId} and s.shield_type = 1 and s.shield_id = g.id)
             and g.goods_status = 3
-        order by g.created_time desc
+        order by g.release_time desc
     </select>
 
     <select id="querySecondGoodsDetail" resultType="shop.alien.entity.second.vo.SecondGoodsRecommendVo">