分页

src/main/java/com/thinkgem/jeesite/common/persistence/Page.java

@@ -39,6 +39,8 @@ public class Page<T> {
 
 	private int length = 8;// 显示页面长度
 	private int slider = 1;// 前后显示页面长度
+
+	private int totalPage;
 	
 	private List<T> list = new ArrayList<T>();
 	
@@ -362,7 +364,6 @@ public class Page<T> {
 	 * 尾页索引
 	 * @return
 	 */
-	@JsonIgnore
 	public int getLast() {
 		return last;
 	}
@@ -371,7 +372,7 @@ public class Page<T> {
 	 * 获取页面总数
 	 * @return getLast();
 	 */
-	@JsonIgnore
+
 	public int getTotalPage() {
 		return getLast();
 	}
@@ -539,6 +540,9 @@ public class Page<T> {
 		return getPageSize();
 	}
 
+	public void setTotalPage(int totalPage) {
+		this.totalPage = totalPage;
+	}
 //	/**
 //	 * 获取 Spring data JPA 分页对象
 //	 */

src/main/java/com/thinkgem/jeesite/modules/pay/api/BenefitController.java

@@ -75,7 +75,12 @@ public class BenefitController{
             return response;
         }
         try {
+
+            // 不分页
             response.setData(benefitSevice.getBenefitList(request));
+
+            // 如果分页则调用
+//            response.setData(benefitSevice.getBenefitPage(request));
             response.setStatus(ComCode.STATUS_CODE_2000);
             response.setMessage(ComCode.STATUS_CODE_2000_DESC);
             return response;

src/main/java/com/thinkgem/jeesite/modules/pay/api/OrderApiController.java

@@ -64,6 +64,38 @@ public class OrderApiController {
 
 
     /**
+     * 获取订单列表 如果需要分页的话，则用这个接口，或者上面的那个接口直接调用分页的service方法
+     * @param request
+     * @return
+     */
+    @PostMapping("/getOrderPage")
+    public Response getOrderPage(OrderRequest<OrderEntity> request){
+        Response res = new Response();
+        if(request == null || StringUtils.isBlank(request.getSubMerchantCode())){
+            res.setStatus(ComCode.STATUS_CODE_4001);
+            res.setMessage(ComCode.STATUS_CODE_4001_DESC);
+            return res;
+        }
+
+        try {
+            System.out.println("开始时间：" + request.getStartDate());
+            System.out.println("结束时间：" + request.getEndDate());
+
+            res.setData(orderService.getOrderPage(request));
+            res.setStatus(ComCode.STATUS_CODE_2000);
+            res.setMessage(ComCode.STATUS_CODE_2000_DESC);
+        }catch (Exception e){
+            res.setMessage(ComCode.STATUS_CODE_9998_DESC);
+            res.setStatus(ComCode.STATUS_CODE_9998);
+            res.setError(e.getMessage());
+            e.printStackTrace();
+        }
+
+        return res;
+    }
+
+
+    /**
      * 获取支付方式
      * @return
      */

src/main/java/com/thinkgem/jeesite/modules/pay/bean/OrderRequest.java

 package com.thinkgem.jeesite.modules.pay.bean;
 
 import com.thinkgem.jeesite.common.baseBean.Request;
+import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 
 import java.util.Date;
@@ -10,7 +11,7 @@ import java.util.Date;
  * @Description: 订单
  * @date 2018年03月18日 10:35
  */
-public class OrderRequest extends Request {
+public class OrderRequest<T> extends Request {
     private String payChannel;// 支付渠道
 
     private String payStatus;// 支付状态
@@ -23,6 +24,10 @@ public class OrderRequest extends Request {
 
     private Long endDate;
 
+    private String payMethod;
+
+    private Page<T> page;
+
     public String getPayChannel() {
         return payChannel;
     }
@@ -70,4 +75,20 @@ public class OrderRequest extends Request {
     public void setEndDate(Long endDate) {
         this.endDate = endDate;
     }
+
+    public String getPayMethod() {
+        return payMethod;
+    }
+
+    public void setPayMethod(String payMethod) {
+        this.payMethod = payMethod;
+    }
+
+    public Page<T> getPage() {
+        return page;
+    }
+
+    public void setPage(Page<T> page) {
+        this.page = page;
+    }
 }

src/main/java/com/thinkgem/jeesite/modules/pay/service/BenefitSevice.java

 package com.thinkgem.jeesite.modules.pay.service;
 
+import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.utils.DateUtils;
 import com.thinkgem.jeesite.modules.pay.bean.OrderRequest;
 import com.thinkgem.jeesite.modules.pay.dao.OrderApiDao;
 import com.thinkgem.jeesite.modules.pay.dao.PayApiDao;
 import com.thinkgem.jeesite.modules.pay.entity.BalanceEntity;
 import com.thinkgem.jeesite.modules.pay.entity.BenefitEntity;
+import com.thinkgem.jeesite.modules.pay.entity.OrderEntity;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -133,4 +135,27 @@ public class BenefitSevice {
 
     }
 
+    /**
+     * 分润 分页
+     * @param request
+     * @return
+     */
+    public Page<BenefitEntity> getBenefitPage(OrderRequest request){
+        if(request.getStartDate()!= null && request.getStartDate() != 0){
+            request.setStartTime(DateUtils.formatDate(new Date(request.getStartDate()),"yyyy-MM-dd") + " 00:00:00");
+        }
+        if(request.getEndDate() != null && request.getEndDate() != 0){
+            request.setEndTime(DateUtils.formatDate(new Date(request.getEndDate()),"yyyy-MM-dd") + " 23:59:59");
+        }
+        Page<BenefitEntity> page = new Page<>();
+        page.setPageNo(request.getPageNum());
+        page.setPageSize(request.getPageSize());
+        request.setPage(page);
+        List<BenefitEntity> list = orderApiDao.getBenefitList(request);
+        page.setList(list);
+        page.setTotalPage(page.getLast());
+        return page;
+
+    }
+
 }

src/main/java/com/thinkgem/jeesite/modules/pay/service/OrderService.java

 package com.thinkgem.jeesite.modules.pay.service;
 
+
+import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.utils.DateUtils;
 import com.thinkgem.jeesite.modules.pay.bean.OrderRequest;
 import com.thinkgem.jeesite.modules.pay.dao.OrderApiDao;
-import com.thinkgem.jeesite.modules.pay.entity.BenefitEntity;
+
 import com.thinkgem.jeesite.modules.pay.entity.OrderEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,6 +26,11 @@ public class OrderService {
     @Autowired
     private OrderApiDao orderApiDao;
 
+    /**
+     * 订单列表
+     * @param request
+     * @return
+     */
     public List<OrderEntity> getOrderList(OrderRequest request){
         if(request.getStartDate()!= null && request.getStartDate() != 0){
             request.setStartTime(DateUtils.formatDate(new Date(request.getStartDate()*1000),"yyyy-MM-dd") + " 00:00:00");
@@ -38,4 +45,27 @@ public class OrderService {
 
 
 
+    /**
+     * 订单列表
+     * @param request
+     * @return
+     */
+    public Page<OrderEntity> getOrderPage(OrderRequest<OrderEntity> request){
+
+        Page<OrderEntity> page = new Page<>();
+        page.setPageNo(request.getPageNum());
+        page.setPageSize(request.getPageSize());
+        request.setPage(page);
+        if(request.getStartDate()!= null && request.getStartDate() != 0){
+            request.setStartTime(DateUtils.formatDate(new Date(request.getStartDate()*1000),"yyyy-MM-dd") + " 00:00:00");
+        }
+        if(request.getEndDate() != null && request.getEndDate() != 0){
+            request.setEndTime(DateUtils.formatDate(new Date(request.getEndDate()*1000),"yyyy-MM-dd") + " 23:59:59");
+        }
+        List<OrderEntity> list = orderApiDao.getOrderList(request);
+        page.setList(list);
+        page.setTotalPage(page.getLast());
+        return page;
+    }
+
 }

src/main/java/com/thinkgem/jeesite/modules/pay/service/PayApiService.java

@@ -71,6 +71,14 @@ public class PayApiService {
     @Autowired
     private AlipayService alipayService;
 
+
+    /**
+     * 快捷支付（分为不同的渠道）
+     * @param request
+     * @return
+     * @throws MyException
+     * @throws Exception
+     */
     @Transactional(readOnly = false)
     public PayBackDto quickPay(JuHeZhongPayRequest request) throws MyException, Exception {
         if(ComCode.PAYCHANNEL_HL2.equals(request.getPayChannel())){