订单管理

pom.xml

@@ -624,7 +624,11 @@
                 </exclusion>
             </exclusions>
         </dependency> -->
-
+        <dependency>
+            <groupId>io.socket</groupId>
+            <artifactId>socket.io-client</artifactId>
+            <version>0.8.3</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/thinkgem/jeesite/modules/sys/dao/DictDao.java

@@ -18,5 +18,6 @@ import com.thinkgem.jeesite.modules.sys.entity.Dict;
 public interface DictDao extends CrudDao<Dict> {
 
 	public List<String> findTypeList(Dict dict);
+	public List<Dict> findDictList(Dict dict);
 	
 }

src/main/java/com/thinkgem/jeesite/modules/sys/entity/Dict.java

@@ -25,6 +25,10 @@ public class Dict extends DataEntity<Dict> {
 	private Integer sort;	// 排序
 	private String parentId;//父Id
 
+	private String parentType;
+
+	private String parentValue;
+
 	public Dict() {
 		super();
 	}
@@ -99,4 +103,21 @@ public class Dict extends DataEntity<Dict> {
 	public String toString() {
 		return label;
 	}
+
+
+	public String getParentType() {
+		return parentType;
+	}
+
+	public void setParentType(String parentType) {
+		this.parentType = parentType;
+	}
+
+	public String getParentValue() {
+		return parentValue;
+	}
+
+	public void setParentValue(String parentValue) {
+		this.parentValue = parentValue;
+	}
 }
\ No newline at end of file

src/main/java/com/thinkgem/jeesite/modules/sys/service/DictService.java

@@ -43,4 +43,13 @@ public class DictService extends CrudService<DictDao, Dict> {
 		CacheUtils.remove(DictUtils.CACHE_DICT_MAP);
 	}
 
+	/**
+	 * 查询字段类型列表
+	 * @return
+	 */
+	public List<Dict> findDictList(Dict dict){
+		return dao.findDictList(dict);
+	}
+
+
 }

src/main/java/com/thinkgem/jeesite/modules/sys/utils/DictUtils.java

@@ -3,6 +3,7 @@
  */
 package com.thinkgem.jeesite.modules.sys.utils;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -81,6 +82,18 @@ public class DictUtils {
 		}
 		return dictList;
 	}
+
+	public static List<Dict> getDictList(String type,String parentId){
+		List<Dict> dictList = new ArrayList<>();
+		if (StringUtils.isNotBlank(type) && StringUtils.isNotBlank(parentId)){
+			for (Dict dict : getDictList(type)){
+				if (type.equals(dict.getType()) && parentId.equals(dict.getLabel())){
+					dictList.add(dict);
+				}
+			}
+		}
+		return dictList;
+	}
 	
 	/**
 	 * 返回字典列表（JSON）

src/main/java/com/thinkgem/jeesite/modules/sys/web/DictBobyController.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
+ */
+package com.thinkgem.jeesite.modules.sys.web;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.thinkgem.jeesite.common.config.Global;
+import com.thinkgem.jeesite.common.persistence.Page;
+import com.thinkgem.jeesite.common.utils.StringUtils;
+import com.thinkgem.jeesite.common.web.BaseController;
+import com.thinkgem.jeesite.modules.sys.entity.Dict;
+import com.thinkgem.jeesite.modules.sys.service.DictService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 字典Controller
+ * @author ThinkGem
+ * @version 2014-05-16
+ */
+@RestController
+@RequestMapping(value = "${adminPath}/sys/dict/boby")
+public class DictBobyController {
+
+	@Autowired
+	private DictService dictService;
+	
+
+	@ResponseBody
+	@RequestMapping(value = "listDataByParent")
+	public List<Dict> listData(Dict dict) {
+		List<Dict> list = dictService.findDictList(dict);
+		return list;
+	}
+
+}

src/main/java/com/thinkgem/jeesite/modules/sys/web/DictController.java

@@ -120,4 +120,11 @@ public class DictController extends BaseController {
 		return dictService.findList(dict);
 	}
 
+	@ResponseBody
+	@RequestMapping(value = "listDataByParent")
+	public List<Dict> listData(Dict dict) {
+		List<Dict> list = dictService.findDictList(dict);
+		return list;
+	}
+
 }

src/main/java/com/thinkgem/jeesite/modules/youka/dao/YoukaBenefitDao.java

@@ -12,4 +12,8 @@ public interface YoukaBenefitDao extends CrudDao<YoukaBenefit>{
     public List<YoukaBenefit> getBenefitList(YoukaBenefit request);
 
     public Integer updateBenefitByDate(YoukaBenefit youkaBenefit);
+
+    // 查询分润
+    public List<YoukaBenefit> getBenefitListByOrderCode(YoukaBenefit request);
+
 }

src/main/java/com/thinkgem/jeesite/modules/youka/dao/YoukaOrderDao.java

+package com.thinkgem.jeesite.modules.youka.dao;
+
+import com.thinkgem.jeesite.common.persistence.CrudDao;
+import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
+import com.thinkgem.jeesite.modules.youka.entity.OrderEntity;
+import com.thinkgem.jeesite.modules.youka.entity.YoukaBenefit;
+import org.springframework.core.annotation.Order;
+
+import java.util.List;
+
+@MyBatisDao
+public interface YoukaOrderDao extends CrudDao<OrderEntity>{
+    public List<OrderEntity> findList(OrderEntity orderEntity);
+}

src/main/java/com/thinkgem/jeesite/modules/youka/entity/OrderEntity.java

@@ -3,6 +3,7 @@ package com.thinkgem.jeesite.modules.youka.entity;
 import com.thinkgem.jeesite.common.persistence.DataEntity;
 
 import java.io.Serializable;
+import java.util.List;
 
 public class OrderEntity extends DataEntity<OrderEntity> implements Serializable {
     private String userCode; // 用户code
@@ -28,6 +29,16 @@ public class OrderEntity extends DataEntity<OrderEntity> implements Serializable
 
     private String code;
 
+    private String benefitAmount; // 分润总金额
+
+    private String benefitDescribe;// 分润去向
+
+    private String nickname;
+
+    private String keywords;
+
+    private List<YoukaBenefit> youkaBenefitList;
+
     public OrderEntity() {
     }
 
@@ -161,4 +172,44 @@ public class OrderEntity extends DataEntity<OrderEntity> implements Serializable
     public void setCode(String code) {
         this.code = code;
     }
+
+    public String getBenefitAmount() {
+        return benefitAmount;
+    }
+
+    public void setBenefitAmount(String benefitAmount) {
+        this.benefitAmount = benefitAmount;
+    }
+
+    public List<YoukaBenefit> getYoukaBenefitList() {
+        return youkaBenefitList;
+    }
+
+    public void setYoukaBenefitList(List<YoukaBenefit> youkaBenefitList) {
+        this.youkaBenefitList = youkaBenefitList;
+    }
+
+    public String getBenefitDescribe() {
+        return benefitDescribe;
+    }
+
+    public void setBenefitDescribe(String benefitDescribe) {
+        this.benefitDescribe = benefitDescribe;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public String getKeywords() {
+        return keywords;
+    }
+
+    public void setKeywords(String keywords) {
+        this.keywords = keywords;
+    }
 }

src/main/java/com/thinkgem/jeesite/modules/youka/entity/YoukaBenefit.java

@@ -24,6 +24,8 @@ public class YoukaBenefit  extends DataEntity<YoukaBenefit> {
 
     private String endDate;
 
+    private String nickname;
+
     public YoukaBenefit() {
     }
 
@@ -141,4 +143,12 @@ public class YoukaBenefit  extends DataEntity<YoukaBenefit> {
     public void setPayMethod(String payMethod) {
         this.payMethod = payMethod;
     }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
 }

src/main/java/com/thinkgem/jeesite/modules/youka/service/YoukaOrderService.java

+package com.thinkgem.jeesite.modules.youka.service;
+
+import com.thinkgem.jeesite.common.persistence.Page;
+import com.thinkgem.jeesite.common.service.CrudService;
+import com.thinkgem.jeesite.modules.youka.dao.YoukaBenefitDao;
+import com.thinkgem.jeesite.modules.youka.dao.YoukaCardDao;
+import com.thinkgem.jeesite.modules.youka.dao.YoukaOrderDao;
+import com.thinkgem.jeesite.modules.youka.entity.OrderEntity;
+import com.thinkgem.jeesite.modules.youka.entity.YoukaBenefit;
+import com.thinkgem.jeesite.modules.youka.entity.YoukaCardEntity;
+import com.thinkgem.jeesite.modules.youka.entity.YoukaUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.DecimalFormat;
+import java.util.List;
+
+/**
+ * @author niehh
+ * @Description:
+ * @date 2018年03月07日 10:22
+ */
+@Service
+@Transactional(readOnly = true)
+public class YoukaOrderService extends CrudService<YoukaOrderDao, OrderEntity> {
+
+
+    @Autowired
+    private YoukaBenefitDao youkaBenefitDao;
+
+    /**
+     * 订单列表
+     * @param page 分页对象
+     * @param orderEntity
+     * @return
+     */
+    public Page<OrderEntity> findPage(Page<OrderEntity> page, OrderEntity orderEntity){
+        Page<OrderEntity> pages = super.findPage(page,orderEntity);
+
+        List<OrderEntity> list = pages.getList();
+
+        if(list!=null && list.size()>0){
+
+
+            for(OrderEntity orderEntity1:list){
+
+                // 目前只有快捷支付有分润
+                if("quick".equals(orderEntity1.getPayMethod())){
+                    YoukaBenefit youkaBenefit = new YoukaBenefit();
+                    youkaBenefit.setOrderCode(orderEntity1.getPayCode());
+
+                    // 查询分润
+                    List<YoukaBenefit> youkaBenefits = youkaBenefitDao.getBenefitListByOrderCode(youkaBenefit);
+
+                    // 统计分润总金额 和分润去向
+
+                    // 分润金额
+                    Double benefitAmount = new Double(0);
+
+                    // 分润去向
+                    StringBuffer stringBuffer = new StringBuffer();
+                    if(youkaBenefits != null && youkaBenefits.size()>0){
+                        for(YoukaBenefit youkaBenefit1:youkaBenefits){
+                            benefitAmount += Double.valueOf(youkaBenefit1.getAmount());
+                            stringBuffer.append(youkaBenefit1.getNickname());
+                            stringBuffer.append("-");
+                            stringBuffer.append(youkaBenefit1.getAmount()).append(";");
+                        }
+                    }
+
+                    DecimalFormat df = new DecimalFormat("######0.00");
+                    orderEntity1.setBenefitAmount(df.format(benefitAmount));
+                    orderEntity1.setBenefitDescribe(stringBuffer.toString());
+                }
+
+            }
+        }
+
+        return page;
+    }
+}

src/main/java/com/thinkgem/jeesite/modules/youka/web/YoukaOrderController.java

+package com.thinkgem.jeesite.modules.youka.web;
+
+import com.thinkgem.jeesite.common.persistence.Page;
+import com.thinkgem.jeesite.common.utils.DateUtils;
+import com.thinkgem.jeesite.common.utils.StringUtils;
+import com.thinkgem.jeesite.common.utils.excel.ExportExcel;
+import com.thinkgem.jeesite.common.web.BaseController;
+import com.thinkgem.jeesite.modules.sys.entity.User;
+import com.thinkgem.jeesite.modules.youka.entity.OrderEntity;
+import com.thinkgem.jeesite.modules.youka.entity.YoukaCardEntity;
+import com.thinkgem.jeesite.modules.youka.entity.YoukaUser;
+import com.thinkgem.jeesite.modules.youka.service.YoukaCardService;
+import com.thinkgem.jeesite.modules.youka.service.YoukaOrderService;
+import com.thinkgem.jeesite.modules.youka.service.YoukaUserDetailService;
+import com.thinkgem.jeesite.modules.youka.service.YoukaUserService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @author niehh
+ * @Description: 优卡用户
+ * @date 2018年03月06日 11:53
+ */
+
+@Controller
+@RequestMapping(value = "${adminPath}/youka/order")
+public class YoukaOrderController extends BaseController {
+
+    @Autowired
+    private YoukaOrderService youkaOrderService;
+
+
+
+    /**
+     * 订单列表
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
+    @RequiresPermissions("youka:order:view")
+    @RequestMapping(value = {"list", ""})
+    public String list(OrderEntity orderEntity, HttpServletRequest request, HttpServletResponse response, Model model) {
+        Page<OrderEntity> page = youkaOrderService.findPage(new Page<OrderEntity>(request, response), orderEntity);
+        model.addAttribute("page", page);
+        model.addAttribute("orderEntity", orderEntity);
+        return "modules/youka/order/orderList";
+    }
+
+
+    /**
+     * 导出订单数据
+     * @param orderEntity
+     * @param request
+     * @param response
+     * @param redirectAttributes
+     * @return
+     */
+    @RequiresPermissions("youka:order:view")
+    @RequestMapping(value = "export", method= RequestMethod.POST)
+    public String exportFile(OrderEntity orderEntity, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
+        try {
+            String fileName = "订单数据"+ DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
+            Page<OrderEntity> page = youkaOrderService.findPage(new Page<OrderEntity>(request, response, -1), orderEntity);
+            new ExportExcel("订单数据", OrderEntity.class).setDataList(page.getList()).write(response, fileName).dispose();
+            return null;
+        } catch (Exception e) {
+            addMessage(redirectAttributes, "导出订单失败！失败信息："+e.getMessage());
+        }
+        return "redirect:" + adminPath + "/order/list?repage";
+    }
+
+}

src/main/resources/mappings/modules/sys/DictDao.xml

@@ -17,6 +17,9 @@
 		<if test="type != null and type != ''">
 			AND type = #{type}
 		</if>
+		<if test="parentId != null and parentId != ''">
+			AND parent_id = #{parentId}
+		</if>
 		<if test="description != null and description != ''">
 			AND description LIKE 
 					<if test="dbName == 'oracle'">'%'||#{description}||'%'</if>
@@ -25,7 +28,27 @@
 		</if>
 		ORDER BY type, sort, update_date DESC
 	</select>
-	
+
+
+    <select id="findDictList" resultType="Dict">
+        SELECT
+        sd.`value`,
+        sd.`label`
+        FROM sys_dict sd
+        LEFT JOIN sys_dict sdp ON sd.parent_id = sdp.id
+        WHERE sd.del_flag = #{DEL_FLAG_NORMAL}
+        <if test="type != null and type != ''">
+            AND sd.type = #{type}
+        </if>
+        <if test="parentType != null and parentType != ''">
+            AND sdp.type = #{parentType}
+        </if>
+        <if test="parentValue != null and parentValue != ''">
+            AND sdp.value = #{parentValue}
+        </if>
+        ORDER BY sd.type, sd.sort, sd.update_date DESC
+    </select>
+
 	<select id="findAllList" resultType="Dict">
 		SELECT 
 			* 

src/main/resources/mappings/modules/youka/YoukaBenefitDao.xml

@@ -35,6 +35,19 @@
 		AND yb.del_flag = 0
 	</select>
 
+	<select id="getBenefitListByOrderCode" resultType="com.thinkgem.jeesite.modules.youka.entity.YoukaBenefit">
+		SELECT
+		yb.amount AS "amount",
+		yu.nickname AS nickname
+		FROM
+		youka_benefit yb
+		LEFT JOIN youka_users yu ON yu.code = yb.user_code
+		WHERE  yb.del_flag = 0
+		AND yb.order_code = #{orderCode}
+	</select>
+
+
+
 	<update id="updateBenefitByDate">
 		UPDATE `youka_benefit` yb
 		SET yb.benefit_status = 1

src/main/resources/mappings/modules/youka/YoukaOrderDao.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.thinkgem.jeesite.modules.youka.dao.YoukaOrderDao">
+
+	<select id="findList" resultType="com.thinkgem.jeesite.modules.youka.entity.OrderEntity">
+		SELECT
+		o.pay_code,
+		o.pay_no,
+		o.pay_status,
+		o.pay_type,
+		o.pay_channel,
+		o.pay_method,
+		o.amount,
+		o.create_date,
+		o.`subject`,
+		yu.nickname,
+		sd.label AS "payMethodName",
+		sdc.label AS "payChannelName"
+		FROM
+		`youka_orders` o
+		LEFT JOIN sys_dict sd ON sd.value = o.pay_method
+		LEFT JOIN sys_dict sdc ON sdc.value = o.pay_channel
+		LEFT JOIN youka_users yu ON yu.code = o.user_code
+		WHERE o.del_flag = 0
+		<if test="nickname != null and nickname != ''">
+			AND yu.nickname like concat("%",#{nickname},"%")
+		</if>
+		<if test="keywords != null and keywords != ''">
+			AND yu.nickname like concat("%",#{nickname},"%")
+			AND yu.mobile like concat("%",#{mobile},"%")
+		</if>
+		<if test="payChannel != null and payChannel != ''">
+			AND o.pay_channel = #{payChannel}
+		</if>
+		<if test="payMethod != null and payMethod != ''">
+			AND o.pay_method = #{payMethod}
+		</if>
+		<if test="payStatus != null and payStatus != ''">
+			AND o.pay_status = #{payStatus}
+		</if>
+		<if test="startTime != null and startTime != ''">
+			AND o.create_date &gt;= #{startTime}
+		</if>
+		<if test="endTime != null and endTime != ''">
+			AND o.create_date &lt;= #{endTime}
+		</if>
+		ORDER BY o.create_date DESC
+	</select>
+</mapper>
\ No newline at end of file

src/main/webapp/WEB-INF/tlds/fns.tld

@@ -136,7 +136,16 @@
     <function-signature>java.util.List getDictList(java.lang.String)</function-signature>
     <example>${fns:getDictList(type)}</example>  
   </function>
-  
+
+  <function>
+    <description>获取字典对象列表</description>
+    <name>getDictListParentId</name>
+    <function-class>com.thinkgem.jeesite.modules.sys.utils.DictUtils</function-class>
+    <function-signature>java.util.List getDictList(java.lang.String,java.lang.String)</function-signature>
+    <example>${fns:getDictList(type)}</example>
+  </function>
+
+
   <function>
     <description>获取字典对象列表</description>
     <name>getDictListJson</name>

src/main/webapp/WEB-INF/views/modules/youka/order/orderList.jsp

+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<html>
+<head>
+	<title>订单管理</title>
+	<meta name="decorator" content="default"/>
+	<script type="text/javascript">
+		$(document).ready(function() {
+            $.ajax({
+                url:"${ctx}/sys/dict/listDataByParent",
+                type: "POST",
+                data:
+                    {
+                        parentType:'pay_method',
+                        parentValue:$("#payMethod").attr("value"),
+                        type:'pay_channel'
+                    }
+                ,
+                async:false,
+                success: function(data){
+                    $("#payChannel").empty();
+                    // $("#payChannel").append('<option value="">全部</option>');
+                    for(var i in data){
+
+                        var payChannel = $("#payChannel").attr("title");
+                        var dict = data[i];
+                        if(payChannel == dict.value){
+                            $("#payChannel").append('<option selected=selected value=' + dict.value + '> ' + dict.label + '</option>');
+						}else{
+                            $("#payChannel").append('<option value=' + dict.value + '> ' + dict.label + '</option>');
+						}
+
+                    }
+
+                }
+            })
+			$("#btnExport").click(function(){
+				top.$.jBox.confirm("确认要导出订单数据吗？","系统提示",function(v,h,f){
+					if(v=="ok"){
+						$("#searchForm").attr("action","${ctx}/youka/order/export");
+						$("#searchForm").submit();
+					}
+				},{buttonsFocus:1});
+				top.$('.jbox-body .jbox-icon').css('top','55px');
+			});
+			$("#btnImport").click(function(){
+				$.jBox($("#importBox").html(), {title:"导入数据", buttons:{"关闭":true}, 
+					bottomText:"导入文件不能超过5M，仅允许导入“xls”或“xlsx”格式文件！"});
+			});
+
+			$("#payMethod").change(function () {
+
+			    var parentValue = $(this).attr("value");
+                $.ajax({
+					url:"${ctx}/sys/dict/listDataByParent",
+                    type: "POST",
+					data:
+						{
+                        parentType:'pay_method',
+                        parentValue:parentValue,
+						type:'pay_channel'
+					}
+					,
+					async:false,
+                    success: function(data){
+                        $("#payChannel").empty();
+                        // $("#payChannel").append('<option value="">全部</option>');
+                        for(var i in data){
+                            var payChannel = $("#payChannel").attr("title");
+                            console.log(payChannel)
+                            var dict = data[i];
+                            if(payChannel == dict.value){
+                                $("#payChannel").append('<option selected="selected" value=' + dict.value + '> ' + dict.label + '</option>');
+                            }else{
+                                $("#payChannel").append('<option value=' + dict.value + '> ' + dict.label + '</option>');
+                            }
+						}
+
+                    }
+                })
+
+            })
+		});
+		function page(n,s){
+			if(n) $("#pageNo").val(n);
+			if(s) $("#pageSize").val(s);
+			$("#searchForm").attr("action","${ctx}/youka/order/list");
+			$("#searchForm").submit();
+	    	return false;
+	    }
+	</script>
+</head>
+<body>
+
+	<ul class="nav nav-tabs">
+		<li class="active"><a href="${ctx}/youka/order/list">订单列表</a></li>
+	</ul>
+	<form:form id="searchForm" modelAttribute="orderEntity" action="${ctx}/youka/order/list" method="post" class="breadcrumb form-search ">
+		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+		<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
+		<ul class="ul-form">
+			<li><label>交易人：</label><form:input path="keywords"></form:input></li>
+			<li><label>支付方式：</label>
+				<form:select id="payMethod" path="payMethod" class="input-medium"><form:option value="" label=""/><form:options itemValue="value" itemLabel="label" items="${fns:getDictList('pay_method')}" htmlEscape="false"/></form:select>
+				<%--<form:select cssStyle="width: 100px;" id="payMethod" path="payMethod" items="${fns:getDictList('pay_method')}" itemLabel="label" itemValue="value" htmlEscape="true" />--%>
+			</li>
+			<li><label>支付渠道：</label>
+				<select title="${orderEntity.payChannel}" name="payChannel" id="payChannel" style="width: 150px;">
+
+				</select>
+			</li>
+			<li><label>交易状态：</label>
+				<form:select path="payStatus" cssStyle="width: 100px">
+					<form:option value="">
+						全部状态
+					</form:option>
+					<form:option value="0">
+						待支付
+					</form:option>
+					<form:option value="1">
+						支付中
+					</form:option>
+					<form:option value="2">
+						已支付
+					</form:option>
+					<form:option value="3">
+						逾期取消
+					</form:option>
+					<form:option value="4">
+						支付失败
+					</form:option>
+				</form:select>
+			</li>
+
+			<li class="btns"><input id="btnSubmit" class="btn btn-primary" type="submit" value="查询" onclick="return page();"/>
+				<input id="btnExport" class="btn btn-primary" type="button" value="导出"/>
+				<%--<input id="btnImport" class="btn btn-primary" type="button" value="导入"/>--%>
+			</li>
+			<li class="clearfix"></li>
+		</ul>
+	</form:form>
+	<sys:message content="${message}"/>
+	<table id="contentTable" class="table table-striped table-bordered table-condensed">
+		<thead><tr><th>序号</th><th>订单号</th><th class="sort-column login_name">交易时间</th><th class="sort-column name">交易人</th><th>交易平台</th><th>状态</th><th>订单金额</th><th>产生分润</th><th>分润去向</th></tr></thead>
+		<tbody>
+		<c:forEach items="${page.list}" var="order" varStatus="indexs">
+			<tr>
+				<td>${indexs.index}</td>
+				<td>${order.payCode}</td>
+				<td><fmt:formatDate value="${order.createDate}" type="both" dateStyle="full"/></td>
+				<td>
+						${order.nickname}
+				</td>
+				<td>
+					${order.payMethodName}-${order.payChannelName}
+				</td>
+				<td>
+					<c:if test="${order.payStatus eq '0'}">待支付</c:if>
+					<c:if test="${order.payStatus eq '1'}">支付中</c:if>
+					<c:if test="${order.payStatus eq '2'}">已支付</c:if>
+					<c:if test="${order.payStatus eq '3'}">逾期取消</c:if>
+					<c:if test="${order.payStatus eq '4'}">支付失败</c:if>
+				</td>
+				<td>${order.amount}</td>
+				<td>${order.benefitAmount}</td>
+				<td>${order.benefitDescribe}</td>
+
+			</tr>
+		</c:forEach>
+		</tbody>
+	</table>
+	<div class="pagination">${page}</div>
+</body>
+</html>
\ No newline at end of file