alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserDynamicsVo.java

@@ -45,4 +45,7 @@ public class LifeUserDynamicsVo extends LifeUserDynamics {
 
     @ApiModelProperty(value = "地址详情")
     private String addressContext;
+
+    @ApiModelProperty(value = "达人标识")
+    private String isExpert;
 }

alien-entity/src/main/java/shop/alien/mapper/LifeFansMapper.java

@@ -199,7 +199,7 @@ public interface LifeFansMapper extends BaseMapper<LifeFans> {
             "( " +
             "    select count(id) " +
             "    from life_user_dynamics " +
-            "    where delete_flag = 0 and phone_id = #{phoneId} " +
+            "    where delete_flag = 0 and phone_id = #{phoneId} and draft = 0 " +
             ") dynamicsNum")
     LifeFansVo getHomePageInfo(@Param("phoneId") String phoneId);
 }

alien-entity/src/main/java/shop/alien/mapper/LifeUserDynamicsMapper.java

@@ -15,21 +15,22 @@ import java.util.List;
 public interface LifeUserDynamicsMapper extends BaseMapper<LifeUserDynamics> {
 
     @Select("with dynamice as( " +
-            "    select id, title, phone_id phoneId, context, image_path, address,address_context, liulan_count, dianzan_count, type, created_time, substring_index(phone_id, '_', 1) flag, substring_index(phone_id, '_', -1) phone, draft " +
+            "    select id, title, phone_id phoneId, context, image_path, address,address_name,address_context, liulan_count, dianzan_count, type, created_time, substring_index(phone_id, '_', 1) flag, substring_index(phone_id, '_', -1) phone, draft " +
             "    from life_user_dynamics " +
             "    where delete_flag = 0 and draft = 0 order by created_time desc" +
             ") " +
-            "select dynamice.*, info.store_name userName, img.img_url userImage, info.id storeUserId, user.id storeOrUserId " +
+            "select dynamice.*, info.store_name userName, img.img_url userImage, info.id storeUserId, user.id storeOrUserId, 0 isExpert " +
             "from dynamice " +
-            "join store_user user on dynamice.phone = user.phone " +
-            "join store_info info on info.id = user.store_id " +
+            "join store_user user on dynamice.phone = user.phone and user.delete_flag = 0 " +
+            "join store_info info on info.id = user.store_id and info.delete_flag = 0 " +
             "left join store_img img on img.store_id = user.store_id and img.img_type = '10' and img.delete_flag = 0  " +
-            "where dynamice.flag = 'store' and user.delete_flag = 0 and info.delete_flag = 0 " +
+            "where dynamice.flag = 'store' " +
             "union " +
-            "select dynamice.*, user.user_name userName, user.user_image userImage, user.id storeUserId, user.id storeOrUserId " +
+            "select dynamice.*, user.user_name userName, user.user_image userImage, user.id storeUserId, user.id storeOrUserId, IF(lue.expert_code IS NOT NULL , 1, 0) AS isExpert " +
             "from dynamice " +
-            "join life_user user on dynamice.phone = user.user_phone " +
-            "where dynamice.flag = 'user' and user.delete_flag = 0")
+            "join life_user user on dynamice.phone = user.user_phone and user.delete_flag = 0 " +
+            "left join life_user_expert  lue on lue.user_id = user.id and lue.delete_flag = 0 " +
+            "where dynamice.flag = 'user'")
     List<LifeUserDynamicsVo> getLifeUserDynamicsList();
 
     @Select("select lud.id ,lud.image_path,lud.context,lu.user_image,lu.user_name,IF(llr.huifu_id IS NOT NULL, 1, 0) AS isLike\n" +