会员 * 优惠券

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberExportBiz.java

@@ -21,10 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 
 import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -188,6 +185,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
             BeanUtils.copyProperties(userMemberExportDTO,baseUserMemberExportVo);
             baseUserMemberExportVos.add(baseUserMemberExportVo);
         }
+        baseUserMemberExportVos.sort(Comparator.comparing(BaseUserMemberExportVo::getCrtTime).reversed());
         baseUserMemberExportVoPageDataVO.setData(baseUserMemberExportVos);
         baseUserMemberExportVoPageDataVO.setPageNum(baseUserMemberExportDataDTOS.getPageNum());
         baseUserMemberExportVoPageDataVO.setPageSize(baseUserMemberExportDataDTOS.getPageSize());

ace-modules/ace-admin/src/main/resources/mapper/BaseUserMemberExportMapper.xml

@@ -32,7 +32,7 @@
            </if>
           <if test="endTime != null and startTime == null">
               and <![CDATA[ `crt_time` <= #{startTime}]]>
-          </if>
+          </if> order  by `crt_time`  DESC
     </select>
 
     <update id="updateUserMemberExportDataStatusById">

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

+package com.xxfc.platform.activity.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/23 10:41
+ */
+@Data
+public class CouponFindDTO  extends PageParam {
+
+     private String title;
+
+     private Integer type;
+}

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

+package com.xxfc.platform.activity.vo;
+
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/23 10:55
+ */
+@Data
+public class CouponPagVo {
+
+}

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

+package com.xxfc.platform.activity.rest.admin;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.activity.biz.CouponBiz;
+import com.xxfc.platform.activity.dto.CouponFindDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/23 10:39
+ */
+@RestController
+@RequestMapping("/admin/coupon")
+public class CouponAdminController {
+
+       @Autowired
+       private CouponBiz couponBiz;
+
+    @GetMapping("/page")
+    public ObjectRestResponse listCouponWithPage(CouponFindDTO couponFindDTO){
+
+
+        return ObjectRestResponse.succ();
+    }
+}