Merge remote-tracking branch 'origin/sit-plantform' into sit-plantform

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

@@ -88,7 +88,7 @@ public interface LifeUserDynamicsMapper extends BaseMapper<LifeUserDynamics> {
             "                      and lf1.delete_flag = '0'")
     List<LifeUserDynamicsVo> selectDianZanList(String phoneId);
 
-    List<LifeUserDynamicsVo> getDynamicsList(@Param("nickName") String nickName, @Param("userType") String userType, @Param("dynamicsType") Integer dynamicsType, @Param("releaseStartTime") String releaseStartTime, @Param("releaseEndTime") String releaseEndTime);
+    List<LifeUserDynamicsVo> getDynamicsList(@Param("nickName") String nickName, @Param("userType") String userType, @Param("dynamicsType") Integer dynamicsType, @Param("releaseStartTime") String releaseStartTime, @Param("releaseEndTime") String releaseEndTime, @Param("storeName") String storeName);
 
     List<LifeUserDynamicsVo> getDynamicsDetail(@Param("id") Integer id);
 

alien-entity/src/main/resources/mapper/LifeUserDynamicsMapper.xml

@@ -49,6 +49,10 @@
             AND dyna1.created_time >= #{releaseStartTime}
         </if>
 
+        <if test="storeName != null and storeName != ''">
+            AND dyna1.store_name LIKE CONCAT('%', #{storeName}, '%')
+        </if>
+
         <if test="releaseEndTime != null and releaseEndTime != ''">
             AND dyna1.created_time &lt;= #{releaseEndTime}
         </if>

alien-store/src/main/java/shop/alien/store/controller/LifeUserDynamicsController.java

@@ -195,12 +195,13 @@ public class LifeUserDynamicsController {
     public R<IPage<LifeUserDynamicsVo>> getDynamicsList(@RequestParam(defaultValue = "1") Integer page,
                                                         @RequestParam(defaultValue = "10") Integer size,
                                                         @RequestParam(required = false) String userName,
+                                                        @RequestParam(required = false) String storeName,
                                                         @RequestParam(required = false) String userType,
                                                         @RequestParam(defaultValue = "0",required = false) Integer dynamicsType,
                                                         @RequestParam(required = false) String releaseStartTime,
                                                         @RequestParam(required = false) String releaseEndTime) {
         log.info("LifeUserDynamicsController.getDynamicsList?page={}&size={}&nickName={}&userType={}&dynamicsType={}", page, size, userName, userType, dynamicsType);
-        List<LifeUserDynamicsVo> stores = lifeUserDynamicsService.getDynamicsList(page, size, userName, userType, dynamicsType, releaseStartTime, releaseEndTime);
+        List<LifeUserDynamicsVo> stores = lifeUserDynamicsService.getDynamicsList(page, size, userName, userType, dynamicsType, releaseStartTime, releaseEndTime, storeName);
         return R.data(ListToPage.setPage(stores, page, size));
     }
 

alien-store/src/main/java/shop/alien/store/service/LifeUserDynamicsService.java

@@ -542,9 +542,9 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
         return  lifeUserDynamicsVos;
     }
 
-    public List<LifeUserDynamicsVo> getDynamicsList(Integer page, Integer size, String nickName, String userType, Integer dynamicsType, String releaseStartTime, String releaseEndTime) {
+    public List<LifeUserDynamicsVo> getDynamicsList(Integer page, Integer size, String nickName, String userType, Integer dynamicsType, String releaseStartTime, String releaseEndTime, String storeName) {
         // 查询动态数据并按类型过滤
-        return lifeUserDynamicsMapper.getDynamicsList(nickName, userType, dynamicsType, releaseStartTime, releaseEndTime);
+        return lifeUserDynamicsMapper.getDynamicsList(nickName, userType, dynamicsType, releaseStartTime, releaseEndTime, storeName);
     }
 
     public LifeUserDynamicsVo getDynamicsDetail(Integer id) {