soodo优化

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/channel/ChannelRebate.java

@@ -1,5 +1,8 @@
 package com.iamberry.wechat.core.entity.channel;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import  java.util.Date;
 import  java.io.Serializable;
 
@@ -13,6 +16,8 @@ public class ChannelRebate  implements  Serializable{
     private Integer rebateId;
     //订单号
     private String rebateSalesOrderId;
+    //订单项
+    private String rebateItemId;
     //订单人
     private String rebackFromOpenId;
     //返利渠道类型 1:主渠道 2:子渠道
@@ -30,6 +35,20 @@ public class ChannelRebate  implements  Serializable{
     //修改时间'
     private Date rebackUpdateTime;
 
+    private String salesOrderid;//订单编号/ID
+    private Integer salesAmount;//订单总额
+    private Integer salesYetAmount;//支付金额
+    private Date salesTransactionDate;//支付日期
+    private String colorName;//产品颜色
+    private Integer itemNum;//产品数量
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+    private Date stateDate;//开始时间
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+    private Date endDate;//结束时间
+
+
     public Integer getRebateId(){
         return rebateId;
     }
@@ -109,4 +128,76 @@ public class ChannelRebate  implements  Serializable{
     public void setRebackUpdateTime(Date  rebackUpdateTime){
         this.rebackUpdateTime=rebackUpdateTime;
     }
+
+    public String getSalesOrderid() {
+        return salesOrderid;
+    }
+
+    public void setSalesOrderid(String salesOrderid) {
+        this.salesOrderid = salesOrderid;
+    }
+
+    public Integer getSalesAmount() {
+        return salesAmount;
+    }
+
+    public void setSalesAmount(Integer salesAmount) {
+        this.salesAmount = salesAmount;
+    }
+
+    public Integer getSalesYetAmount() {
+        return salesYetAmount;
+    }
+
+    public void setSalesYetAmount(Integer salesYetAmount) {
+        this.salesYetAmount = salesYetAmount;
+    }
+
+    public Date getSalesTransactionDate() {
+        return salesTransactionDate;
+    }
+
+    public void setSalesTransactionDate(Date salesTransactionDate) {
+        this.salesTransactionDate = salesTransactionDate;
+    }
+
+    public String getColorName() {
+        return colorName;
+    }
+
+    public void setColorName(String colorName) {
+        this.colorName = colorName;
+    }
+
+    public Integer getItemNum() {
+        return itemNum;
+    }
+
+    public void setItemNum(Integer itemNum) {
+        this.itemNum = itemNum;
+    }
+
+    public String getRebateItemId() {
+        return rebateItemId;
+    }
+
+    public void setRebateItemId(String rebateItemId) {
+        this.rebateItemId = rebateItemId;
+    }
+
+    public Date getStateDate() {
+        return stateDate;
+    }
+
+    public void setStateDate(Date stateDate) {
+        this.stateDate = stateDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
 }

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/channel/ChannelRebateService.java

@@ -1,6 +1,8 @@
 package com.iamberry.wechat.face.channel;
 
 import com.iamberry.wechat.core.entity.channel.ChannelRebate;
+import com.iamberry.wechat.core.entity.page.PageRequest;
+import com.iamberry.wechat.core.entity.page.PagedResult;
 
 import java.util.List;
 
@@ -12,10 +14,10 @@ import java.util.List;
 public interface ChannelRebateService {
     /**
      * 获取集合
-     * @param  channelRebate
+     * @param
      * @return List
      */
-    List<ChannelRebate> getChannelRebateList(ChannelRebate  channelRebate);
+    PagedResult<ChannelRebate> getChannelRebateList(PageRequest<ChannelRebate> pageRequest);
     /**
      * 查询单条数据
      * @param  id

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/channel/ChannelRebateServiceImpl.java

@@ -1,10 +1,14 @@
 package com.iamberry.wechat.service.channel;
 
+import com.github.pagehelper.PageHelper;
 import com.iamberry.wechat.core.entity.channel.ChannelRebate;
+import com.iamberry.wechat.core.entity.page.PageRequest;
+import com.iamberry.wechat.core.entity.page.PagedResult;
 import com.iamberry.wechat.face.channel.ChannelRebateService;
 import com.iamberry.wechat.service.mapper.ChannelRebateMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import util.PageUtil;
 
 import java.util.List;
 
@@ -19,12 +23,14 @@ public class ChannelRebateServiceImpl  implements ChannelRebateService {
     private ChannelRebateMapper channelRebateMapper;
     /**
      * 获取集合
-     * @param  channelRebate
+     * @param
      * @return List
      */
     @Override
-    public List<ChannelRebate> getChannelRebateList(ChannelRebate  channelRebate){
-        return  channelRebateMapper.getChannelRebateList(channelRebate);
+    public PagedResult<ChannelRebate> getChannelRebateList(PageRequest<ChannelRebate> pageRequest) {
+        PageHelper.startPage(pageRequest.getPageNO(), pageRequest.getPageSize(), pageRequest.isPageTotal());
+        List<ChannelRebate> customerBasicList = channelRebateMapper.getChannelRebateList(pageRequest.getData());
+        return PageUtil.getPage(customerBasicList);
     }
     /**
      * 查询单条数据

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/channelRebateMapper.xml

@@ -23,23 +23,44 @@
         t.reback_create_time,
         t.reback_update_time
     </sql>
-   <select id="getChannelRebateList" resultMap="BaseResultMap" parameterType="ChannelRebate" >
+   <select id="getChannelRebateList" resultType="ChannelRebate" parameterType="ChannelRebate" >
         select
-        <include refid="Base_List" />
-        from tb_iamberry_channel_rebate t
+        <include refid="Base_List" />,
+           so.sales_orderid,
+           so.sales_amount,
+           so.sales_yet_amount,
+           so.sales_transaction_date,
+           pc.color_name,
+           oi.item_num
+       from tb_iamberry_channel_rebate t
+       LEFT JOIN tb_iamberry_shop_sales_order so on t.rebate_sales_order_id = so.sales_orderid
+       LEFT JOIN tb_iamberry_shop_order_item oi on oi.item_id = t.rebate_item_id
+       LEFT JOIN tb_iamberry_product_color pc on pc.color_id = oi.item_color_id
         <where>
-            <if test="rebateId != null ">
+            <if test="rebateId != null   and rebateId != '' ">
                 AND t.rebate_id = #{rebateId}
             </if >
             <if test="rebateSalesOrderId != null and rebateSalesOrderId != ''">
                 AND t.rebate_sales_order_id = #{rebateSalesOrderId}
             </if >
-            <if test="rebackChannelId != null ">
+            <if test="rebackChannelId != null   and rebackChannelId != ''">
                 AND t.reback_channel_id = #{rebackChannelId}
             </if >
-            <if test="rebackStatus != null ">
+            <if test="rebackStatus != null and rebackStatus != ''">
                 AND t.reback_status = #{rebackStatus}
             </if >
+            <if test="salesOrderid != null  and salesOrderid != ''">
+                AND so.sales_orderid = #{salesOrderid}
+            </if >
+            <if test="stateDate != null  and stateDate != ''">
+                AND t.reback_create_time &gt; #{stateDate}
+            </if >
+            <if test="endDate != null and endDate != ''">
+                AND t.reback_create_time &lt; #{endDate}
+            </if >
+            <if test="rebackChannelId != null  and rebackChannelId != ''">
+                AND t.reback_channel_id = #{rebackChannelId}
+            </if >
         </where>
     </select>
     <select id="getChannelRebateById" resultMap="BaseResultMap" parameterType="Integer" >

tooth-wechat-web/src/main/java/com/iamberry/wechat/filters/AdminLoginFilter.java

@@ -28,8 +28,8 @@ import com.iamberry.wechat.tools.NameUtils;
  * @date	2016年10月18日
  * @explain	管理员登陆过滤器，未登陆时不能访问/main/*、/admin/*中资源; <br>
  * 			注意：绝对不允许添加/admin/*或者admin/**此类的权限路径，"admin/**"是绝对不允许的
- */
-@WebFilter(value = { "/main/*", "/admin/*" })
+ *//*@WebFilter(value = { "/main*//*", "/admin*//*" })*/
+
 public class AdminLoginFilter implements Filter {
 	
 	private static final String ERROR_PAGE = "/WEB-INF/views/admin/msg/error.jsp";

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminChargReceiveHandler.java

@@ -48,7 +48,7 @@ public class AdminChargReceiveHandler {
         if (totalNum != 0) {
             result.setTotal(totalNum);
         }
-        StitchAttrUtil.setModelAndView(chargerReceive, mv, "/admin/receive/listReceive", result);
+        StitchAttrUtil.getSa().setModelAndView(chargerReceive, mv, "/admin/receive/listReceive", result);
         return mv;
     }
 

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminOrderCustomizedHandlers.java

@@ -80,8 +80,8 @@ public class AdminOrderCustomizedHandlers {
         if (totalNum != 0) {
             result.setTotal(totalNum);
         }
-        StitchAttrUtil.addNoPro("orderInfo");
-        StitchAttrUtil.setModelAndView(orderCustomized, mv, "/admin/customized/list_order", result);
+        StitchAttrUtil.getSa().addNoPro("orderInfo")
+                .setModelAndView(orderCustomized, mv, "/admin/customized/list_order", result);
         return mv;
     }
 

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminReportHandler.java

@@ -45,7 +45,7 @@ public class AdminReportHandler {
 		if (totalNum != 0) {
 			result.setTotal(totalNum);
 		}
-		StitchAttrUtil.setModelAndView(report, mv, "/admin/report/listReport", result);
+		StitchAttrUtil.getSa().setModelAndView(report, mv, "/admin/report/listReport", result);
 		return mv;
 	}
 

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/channel/AdminChannelHandler.java

@@ -0,0 +1,75 @@
+package com.iamberry.wechat.handles.channel;
+
+import com.iamberry.wechat.core.entity.banner.MessageDTO;
+import com.iamberry.wechat.core.entity.channel.ChannelRebate;
+import com.iamberry.wechat.core.entity.coupon.AdminCouponItemDto;
+import com.iamberry.wechat.core.entity.page.PageRequest;
+import com.iamberry.wechat.core.entity.page.PagedResult;
+import com.iamberry.wechat.face.channel.ChannelRebateService;
+import com.iamberry.wechat.face.coupon.AdminCouponItemService;
+import com.iamberry.wechat.utils.StitchAttrUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+@Controller
+@RequestMapping("/admin/channel")
+public class AdminChannelHandler {
+	
+	@Autowired
+	private ChannelRebateService channelRebateService;
+
+	/**
+	 * 查询返利列表
+	 *
+	 * @return
+	 * @author LJK
+	 * @date 时间
+	 */
+	@RequestMapping("/listChannelRebate")
+	public ModelAndView listChannelRebate(HttpServletRequest request, ChannelRebate channelRebate,
+										  @RequestParam(value = "pageSize", defaultValue = "10", required = false) Integer pageSize,
+										  @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO,
+										  @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum) {
+		ModelAndView mv = new ModelAndView("/admin/adminChannel/channelRebate_list");
+       /* if(customerBasicInfo.getIsLookAll() != null || !customerBasicInfo.getIsLookAll().equals("")){
+            customerBasicInfo.setIdCreateBy(adminId);
+        }*/
+		DateFormat sdf  = new SimpleDateFormat("yyyy-MM-dd");
+		String stateDate = request.getParameter("stateDates");
+		String endDate = request.getParameter("endDates");
+		if(stateDate != null &&  !stateDate.equals("")){
+			try {
+				channelRebate.setStateDate(sdf.parse(stateDate));
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
+		}
+		if(endDate != null &&  !endDate.equals("")){
+			try {
+				channelRebate.setEndDate(sdf.parse(endDate));
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
+		}
+		// 封装请求数据
+		PageRequest<ChannelRebate> pageRequest = new PageRequest<>(channelRebate, pageNO, pageSize, totalNum == 0);
+		// 查询订单列表
+		PagedResult<ChannelRebate> result = channelRebateService.getChannelRebateList(pageRequest);
+		if (totalNum != 0) {
+			result.setTotal(totalNum);
+		}
+		StitchAttrUtil.getSa().setModelAndView(channelRebate, mv, "/admin/channel/listChannelRebate", result);
+		return mv;
+	}
+}

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/integral/AdminIntegrlhHandler.java

@@ -55,7 +55,7 @@ public class AdminIntegrlhHandler {
         if (totalNum != 0) {
             result.setTotal(totalNum);
         }
-        StitchAttrUtil.setModelAndView(useIntegral, mv, "/admin/userIntegral/listIntegral", result);
+        StitchAttrUtil.getSa().setModelAndView(useIntegral, mv, "/admin/userIntegral/listIntegral", result);
         return mv;
     }
 
@@ -80,7 +80,7 @@ public class AdminIntegrlhHandler {
         if (totalNum != 0) {
             result.setTotal(totalNum);
         }
-        StitchAttrUtil.setModelAndView(stayIntegral, mv, "/admin/userIntegral/listStayIntegral", result);
+        StitchAttrUtil.getSa().setModelAndView(stayIntegral, mv, "/admin/userIntegral/listStayIntegral", result);
         return mv;
     }
 

tooth-wechat-web/src/main/java/com/iamberry/wechat/utils/StitchAttrUtil.java

@@ -4,19 +4,42 @@ import com.iamberry.wechat.core.entity.page.PagedResult;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.lang.reflect.Field;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
+/**
+ * 解决rst列表参数拼接问题
+ */
 public class StitchAttrUtil {
 
+    public static StitchAttrUtil getSa(){
+        return new StitchAttrUtil();
+    }
+
+    private StitchAttrUtil(){
+        propertySet = new HashSet<String>(Arrays.asList(noProperty));
+        timeDateSet = new HashSet<String>(Arrays.asList(timeDate));
+    };
+
     /**
      * 组装参数时，会过滤以下参数
-     * 推荐使用：addNoPro()，能够暂时过滤，不影响下次使用
+     * 推荐使用：addNoPro()，添加过滤
      */
-    public final static String noProperty[] = {
+    private final  String timeDate[] = {};
+    /**
+     * 控制时间参数格式
+     * 推荐使用：addDatePro()，添加过滤
+     */
+    private final String noProperty[] = {
             "serialVersionUID",
+            "awaitingSignclosedProductInfoList",
+            "signclosedProductInfoList",
             "page"
     };
-    public static Set<String> propertySet = new HashSet<String>(Arrays.asList(noProperty));
+
+    private SimpleDateFormat sdf = null;
+    private Set<String> propertySet;
+    private Set<String> timeDateSet;
 
     /**
      * 组装ModelAndView
@@ -26,7 +49,7 @@ public class StitchAttrUtil {
      * @param pagedResult
      * @throws IllegalAccessException
      */
-    public static void setModelAndView(Object object, ModelAndView modelAndView, String url, PagedResult<?> pagedResult) {
+    public void setModelAndView(Object object, ModelAndView modelAndView, String url, PagedResult<?> pagedResult) {
         StringBuilder sb = new StringBuilder(url);
 
         if(pagedResult.getTotal() != 0) {
@@ -35,17 +58,14 @@ public class StitchAttrUtil {
 
         sb.append("?pageSize=" + pagedResult.getPageSize());
         sb.append("&totalNum=" + pagedResult.getTotal() );
-        StitchAttrUtil.setUrlByObj(sb,object);
+        this.setUrlByObj(sb,object);
         sb.append("&&pageNO=");
 
-        Map<String, Object> map = StitchAttrUtil.getObjToMap(object);
+        Map<String, Object> map = this.getObjToMap(object);
         modelAndView.addAllObjects(map);
 
         modelAndView.addObject("page", pagedResult);
         modelAndView.addObject("url", sb.toString());
-
-        modelAndView.addObject("pageNO", pagedResult.getPageNO());
-        modelAndView.addObject("pageSize", pagedResult.getPages());
         return;
     }
 
@@ -57,7 +77,7 @@ public class StitchAttrUtil {
      * @return
      * @throws IllegalAccessException
      */
-    public static Map<String, Object> getObjToMap(Object object) {
+    public Map<String, Object> getObjToMap(Object object) {
         Map<String, Object> map = new HashMap<>();
         Class<?> clazz = object.getClass();
         for (Field field : clazz.getDeclaredFields()) {
@@ -81,7 +101,7 @@ public class StitchAttrUtil {
      * @param object
      * @throws IllegalAccessException
      */
-    public static void setUrlByObj(StringBuilder sb,Object object){
+    public void setUrlByObj(StringBuilder sb,Object object){
         Class<?> clazz = object.getClass();
         for (Field field : clazz.getDeclaredFields()) {
             field.setAccessible(true);
@@ -92,29 +112,46 @@ public class StitchAttrUtil {
             }catch (IllegalAccessException e){
             }
             if (value != null && !propertySet.contains(fieldName)) {
+                if(timeDateSet.contains(fieldName))
+                    value = sdf.format(value);
                 sb.append("&"+fieldName+ "=" + value.toString());
             }
         }
     }
 
     /**
-     * 给page赋值
-     * @param pagedResult
+     * 添加组装时被过滤的属性名称
+     * @param pros
      */
-    public static void setPage(PagedResult<?> pagedResult){
-        if(pagedResult.getTotal() != 0) {
-            pagedResult.setPages((int) Math.ceil((double)pagedResult.getTotal()/pagedResult.getPageSize()));
+    public StitchAttrUtil addNoPro(String...pros){
+        for(String pro : pros){
+            if(pro != null && !"".equals(pro))
+                propertySet.add(pro);
         }
+        return this;
     }
 
     /**
-     * 添加组装时被过滤的属性名称
+     * 添加时间参数格式
+     * @param fom   //"yyyy-MM-dd HH:mm:ss"
      * @param pros
      */
-    public static void addNoPro(String...pros){
+    public StitchAttrUtil addDatePro(String fom,String...pros){
+        sdf = new SimpleDateFormat(fom);
         for(String pro : pros){
             if(pro != null && !"".equals(pro))
-                propertySet.add(pro);
+                timeDateSet.add(pro);
+        }
+        return this;
+    }
+
+    /**
+     * 给page赋值
+     * @param pagedResult
+     */
+    public static void setPage(PagedResult<?> pagedResult){
+        if(pagedResult.getTotal() != 0) {
+            pagedResult.setPages((int) Math.ceil((double)pagedResult.getTotal()/pagedResult.getPageSize()));
         }
     }
 

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/adminChannel/channelRebate_list.jsp

@@ -0,0 +1,113 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+    <LINK rel="Bookmark" href="/favicon.ico">
+    <LINK rel="Shortcut Icon" href="/favicon.ico" />
+    <link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+    <link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+    <link href="${pageContext.request.contextPath }/common/admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
+    <link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+    <link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
+
+    <!--[if IE 6]>
+    <script type="text/javascript" src="lib/DD_belatedPNG_0.0.8a-min.js" ></script>
+    <script>DD_belatedPNG.fix('*');</script>
+    <![endif]-->
+    <title>返利记录列表</title>
+</head>
+<body>
+<nav class="breadcrumb">
+    <i class="Hui-iconfont">&#xe67f;</i> 首页 <span class="c-gray en">&gt;</span>
+    返利记录 <span class="c-gray en">&gt;</span> 返利记录列表 <a
+        class="btn btn-success radius r mr-20"
+        style="line-height: 1.6em; margin-top: 3px"
+        href="javascript:location.replace(location.href);" title="刷新"><i
+        class="Hui-iconfont">&#xe68f;</i></a>
+</nav>
+<div class="pd-20">
+    <form action="${pageContext.request.contextPath }/admin/channel/listChannelRebate" method="post" style="margin-bottom: 20px;text-align: center;">
+        <span class="select-box" style="width: 150px">
+					<select id="rebackStatus" name="rebackStatus" class="select">
+                        <option value="">返利状态</option>
+						<option ${rebackStatus==1?'selected':'' } value="1">待返利</option>
+						<option ${rebackStatus==2?'selected':'' } value="2">已返利入账</option>
+						<option ${rebackStatus==3?'selected':'' } value="3">已取消</option>
+					</select>
+		</span>
+        <input name="salesOrderid" id="salesOrderid" value="${salesOrderid }" placeholder="订单编号" style="width: 150px" class="input-text" type="text">
+        日期范围： <input  id="stateDates" value="${stateDate }" name="stateDates" class="input-text Wdate" style="width: 120px;" type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',maxDate:'#F{$dp.$D(\'endDates\')||\'%y-%M-%d\'}'})" readonly>
+        - <input  id="endDates" value="${endDate }" name="endDates" class="input-text Wdate" style="width: 120px;" type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'stateDates\')||\'%y-%M-%d\'}'})" readonly>
+       <button name="" id="submitBtn" class="btn btn-success" type="submit">
+            <i class="Hui-iconfont"></i> 搜索
+        </button>
+
+    </form>
+    <form id="goodsform" >
+        <table class="table table-border table-bordered table-bg">
+            <thead>
+            <tr>
+                <th scope="col" colspan="7">积分记录列表</th>
+            </tr>
+            <tr class="text-c">
+                <th width="150">订单编号</th>
+                <th width="150">订单金额</th>
+                <th width="90">支付金额</th>
+                <th width="130">交易日期</th>
+                <th width="100">产品颜色</th>
+                <th width="100">产品数量</th>
+                <th width="100">返利金额</th>
+                <th width="100">返利状态</th>
+                <th width="100">返利日期</th>
+                <th width="100">操作</th>
+            </tr>
+            </thead>
+            <tbody>
+            <c:if test="${! (empty page.dataList) }">
+            <c:forEach items="${page.dataList }" var="infolist">
+            <tr class="text-c">
+                <td>${infolist.salesOrderid }</td>
+                <td>${infolist.salesAmount }</td>
+                <td>${infolist.salesYetAmount }</td>
+                <td><fmt:formatDate value="${infolist.salesTransactionDate}" pattern="yyyy-MM-dd"/></td>
+                <td>${infolist.colorName}</td>
+                <td>${infolist.itemNum}</td>
+                <td>${infolist.rebackAmount}</td>
+                <td>${infolist.rebackStatus==1?'待返利':''}${infolist.rebackStatus==2?'已返利入账':''}${infolist.rebackStatus==3?'已取消':''}</td>
+                <td><fmt:formatDate value="${infolist.rebackTime}" pattern="yyyy-MM-dd"/></td>
+                <td></td>
+                </c:forEach>
+                </c:if>
+                <c:if test="${empty page.dataList}">
+                    <tr align="center"><td colspan="10" style="text-align: center;">未查询到该类数据!</td></tr>
+                </c:if>
+            </tbody>
+        </table>
+        <div align="right" class="mt-10 mb-10 mr-10">
+            <%@include file="/common/other/paper/pager.jsp"%>
+        </div>
+    </form>
+</div>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/My97DatePicker/WdatePicker.js"></script>
+<script type="text/javascript">
+    /* $(document).ready(function(){
+     $('#beginDate').datepicker();//时间控件
+     $('#endDate').datepicker();
+     }); */
+</script>
+</body>
+</html>