123

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/dto/ActivityDTO.java

@@ -24,5 +24,7 @@ public class ActivityDTO extends PageParam {
      private Long endTime;
      private Integer goodsType;
      private Integer type;
+     private Integer userId;
+     private Integer id;
 
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityBiz.java

@@ -3,7 +3,6 @@ package com.xxfc.platform.activity.biz;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.activity.dto.ActivityDTO;
 import com.xxfc.platform.activity.vo.ActivityVo;
@@ -40,17 +39,26 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
     public ObjectRestResponse<PageDataVO<ActivityVo>> getAllByPage(ActivityDTO activityDTO) {
         Integer page = activityDTO.getPage() == null ? 1 : activityDTO.getPage();
         Integer limit = activityDTO.getLimit() == null ? 10 : activityDTO.getLimit();
-        activityDTO.setPage(page);
-        activityDTO.setLimit(limit);
-        Query query = new Query(activityDTO);
-        PageDataVO<ActivityVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getAllByPage(query.getSuper()));
+        PageDataVO<ActivityVo> pageDataVO = PageDataVO.pageInfo(page,limit,()->getList(activityDTO) );
         List<ActivityVo>  list = pageDataVO.getData();
+        setUserInfo(list);
+        return ObjectRestResponse.succ(pageDataVO);
+    }
+
+
+    public  List<ActivityVo> getList(ActivityDTO activityDTO){
+        return  mapper.getAllByPage(activityDTO);
+    }
+
+
+
+    public  void  setUserInfo(List<ActivityVo> list){
         if (CollectionUtils.isNotEmpty(list)){
             List<Integer> userIds = list.stream().map(ActivityVo::getCtrUser).distinct().collect(Collectors.toList());
             List<AppUserVo> appUserVos = userFeign.getByUserIds(userIds).getData();
             Map<Integer, AppUserVo> userMap = new HashMap<>();
             if (CollectionUtils.isNotEmpty(appUserVos)){
-                 userMap = appUserVos.stream().collect(Collectors.toMap(AppUserVo::getUserid, Function.identity()));
+                userMap = appUserVos.stream().collect(Collectors.toMap(AppUserVo::getUserid, Function.identity()));
             }
             for(ActivityVo activityVo : list){
                 AppUserVo appUserVo = userMap.get(activityVo.getCtrUser());
@@ -62,6 +70,16 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
                 }
             }
         }
-        return ObjectRestResponse.succ(pageDataVO);
     }
-}
+
\ No newline at end of file
+    public ActivityVo  getActivityInfo(ActivityDTO activityDTO){
+        List<ActivityVo> list = getList(activityDTO);
+        if (list.size() > 0){
+            setUserInfo(list);
+            return  list.get(0);
+        }
+        return  null;
+    }
+}
+
+

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/mapper/ActivityMapper.java

 package com.xxfc.platform.activity.mapper;
 
+import com.xxfc.platform.activity.dto.ActivityDTO;
 import com.xxfc.platform.activity.entity.Activity;
 import com.xxfc.platform.activity.vo.ActivityLuckyDrawListVo;
 import com.xxfc.platform.activity.vo.ActivityVo;
@@ -16,5 +17,5 @@ import java.util.Map;
  * @date 2020-10-08 09:48:35
  */
 public interface ActivityMapper extends Mapper<Activity> {
-    List<ActivityVo> getAllByPage(Map<String, Object> param);
+    List<ActivityVo> getAllByPage(ActivityDTO activityDTO);
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityController.java

@@ -37,4 +37,18 @@ public class ActivityController extends BaseController<ActivityBiz, Activity> {
         return ObjectRestResponse.succ(activityTypeBiz.getList());
     }
 
+
+    @GetMapping("selectListByUserId")
+    public ObjectRestResponse<PageDataVO<ActivityVo>> selectListByUserId( ActivityDTO activityDTO) {
+        activityDTO.setUserId(getCurrentUserIdInt());
+        return baseBiz.getAllByPage(activityDTO);
+    }
+
+
+    @GetMapping("app/unauth/info")
+    @IgnoreUserToken
+    public ObjectRestResponse<ActivityVo> info( ActivityDTO activityDTO) {
+        return ObjectRestResponse.succ(baseBiz.getActivityInfo(activityDTO));
+    }
+
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/resources/mapper/ActivityMapper.xml

@@ -31,7 +31,7 @@
         <result property="isSee" column="is_see"/>
     </resultMap>
 
-    <select id="getAllByPage" resultType="com.xxfc.platform.activity.vo.ActivityVo" parameterType="Map">
+    <select id="getAllByPage" resultType="com.xxfc.platform.activity.vo.ActivityVo" parameterType="com.xxfc.platform.activity.dto.ActivityDTO">
         select a.*,t.name as typeName from `activity` a
         LEFT JOIN activity_type t on a.type=t.type
         <where>
@@ -41,6 +41,12 @@
             <if test="type != null">
                 and a.`type`=#{type}
             </if>
+            <if test="userId != null and userId > 0">
+                and a.`ctr_user`=#{userId}
+            </if>
+            <if test="activityId != null and activityId > 0">
+                and a.`id`=#{activityId}
+            </if>
             <if test="startTime != null and  startTime > 0">
                 and <![CDATA[
                 a.`crt_time` >= #{startTime}