活动接口

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

+package com.xxfc.platform.activity.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/3 18:56
+ */
+@Data
+@Builder(toBuilder = true)
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityDTO extends PageParam {
+
+     private Date startTime;
+     private Date endTime;
+     private Integer goodsType;
+
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/vo/ActivityVo.java

+package com.xxfc.platform.activity.vo;
+
+import com.xxfc.platform.activity.entity.Activity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+/**
+ * 峰会活动表
+ * 
+ * @author wuweizhi
+ * @email 18178966185@163.com
+ * @date 2020-10-08 09:48:35
+ */
+@Data
+public class ActivityVo extends Activity {
+
+}

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

 package com.xxfc.platform.activity.biz;
 
+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.dto.ActivityLuckDrawFindDTO;
+import com.xxfc.platform.activity.vo.ActivityLuckyDrawListVo;
+import com.xxfc.platform.activity.vo.ActivityVo;
 import org.springframework.stereotype.Service;
 
 import com.xxfc.platform.activity.entity.Activity;
@@ -15,4 +22,14 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
  */
 @Service
 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()));
+        return ObjectRestResponse.succ(pageDataVO);
+    }
 }
\ No newline at end of file

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.entity.Activity;
+import com.xxfc.platform.activity.vo.ActivityLuckyDrawListVo;
+import com.xxfc.platform.activity.vo.ActivityVo;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 峰会活动表
  * 
@@ -11,5 +16,5 @@ import tk.mybatis.mapper.common.Mapper;
  * @date 2020-10-08 09:48:35
  */
 public interface ActivityMapper extends Mapper<Activity> {
-	
+    List<ActivityVo> getAllByPage(Map<String, Object> param);
 }

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

+package com.xxfc.platform.activity.rest.admin;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.activity.biz.ActivityBiz;
+import com.xxfc.platform.activity.dto.ActivityDTO;
+import com.xxfc.platform.activity.dto.ActivityLuckDrawFindDTO;
+import com.xxfc.platform.activity.entity.Activity;
+import com.xxfc.platform.activity.vo.ActivityLuckyDrawListVo;
+import com.xxfc.platform.activity.vo.ActivityVo;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("admin/activity")
+public class ActivityAdminController extends BaseController<ActivityBiz, Activity> {
+
+    /**
+     * 活动列表
+     *
+     * @param activityDTO
+     * @return
+     */
+    @PostMapping("/page")
+    @ResponseBody
+    public ObjectRestResponse<PageDataVO<ActivityVo>> listActivtyLuckyDrawWithPage(@RequestBody ActivityDTO activityDTO) {
+        return baseBiz.getAllByPage(activityDTO);
+    }
+}
\ No newline at end of file

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

@@ -30,4 +30,24 @@
         <result property="isDel" column="is_del"/>
     </resultMap>
 
+    <select id="getAllByPage" resultType="com.xxfc.platform.activity.vo.ActivityVo" parameterType="Map">
+        select * from `activity` where 1=1
+        <if test="goodsType != null">
+            and `goods_type`=#{goodsType}
+        </if>
+        <if test="startTime != null and endTime != null">
+            and `crt_time` between #{startTime} and #{endTime}
+        </if>
+        <if test="startTime != null and endTime == null">
+            and <![CDATA[
+            `crt_time` >= #{startTime}
+            ]]>
+        </if>
+        <if test="startTime==null and endTime!=null">
+            and <![CDATA[
+            `crt_time`<=#{endTime}
+            ]]>
+        </if>
+        order by `crt_time` desc
+    </select>
 </mapper>
\ No newline at end of file