订单查询

src/main/java/com/minpay/db/table/model/VmOrderDetails.java

@@ -109,6 +109,14 @@ public class VmOrderDetails extends AbstractMINBean {
 
     /**
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_order_details.VOD_IS_WINNING
+     *
+     * @mbggenerated
+     */
+    private String isWinning;
+
+    /**
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column vm_order_details.VOD_CREATE_USER
      *
      * @mbggenerated
@@ -140,6 +148,22 @@ public class VmOrderDetails extends AbstractMINBean {
     private String modifyTime;
 
     /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_order_details.VOD_DELIVERY_ID
+     *
+     * @mbggenerated
+     */
+    private String deliveryId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_order_details.VOD_IS_DELIVERY
+     *
+     * @mbggenerated
+     */
+    private String isDelivery;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column vm_order_details.VOD_DETAILS_ID
      *
@@ -453,6 +477,30 @@ public class VmOrderDetails extends AbstractMINBean {
 
     /**
      * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_order_details.VOD_IS_WINNING
+     *
+     * @return the value of vm_order_details.VOD_IS_WINNING
+     *
+     * @mbggenerated
+     */
+    public String getIsWinning() {
+        return isWinning;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_order_details.VOD_IS_WINNING
+     *
+     * @param isWinning the value for vm_order_details.VOD_IS_WINNING
+     *
+     * @mbggenerated
+     */
+    public void setIsWinning(String isWinning) {
+        this.isWinning = isWinning == null ? null : isWinning.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
      * This method returns the value of the database column vm_order_details.VOD_CREATE_USER
      *
      * @return the value of vm_order_details.VOD_CREATE_USER
@@ -546,4 +594,52 @@ public class VmOrderDetails extends AbstractMINBean {
     public void setModifyTime(String modifyTime) {
         this.modifyTime = modifyTime == null ? null : modifyTime.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_order_details.VOD_DELIVERY_ID
+     *
+     * @return the value of vm_order_details.VOD_DELIVERY_ID
+     *
+     * @mbggenerated
+     */
+    public String getDeliveryId() {
+        return deliveryId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_order_details.VOD_DELIVERY_ID
+     *
+     * @param deliveryId the value for vm_order_details.VOD_DELIVERY_ID
+     *
+     * @mbggenerated
+     */
+    public void setDeliveryId(String deliveryId) {
+        this.deliveryId = deliveryId == null ? null : deliveryId.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_order_details.VOD_IS_DELIVERY
+     *
+     * @return the value of vm_order_details.VOD_IS_DELIVERY
+     *
+     * @mbggenerated
+     */
+    public String getIsDelivery() {
+        return isDelivery;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_order_details.VOD_IS_DELIVERY
+     *
+     * @param isDelivery the value for vm_order_details.VOD_IS_DELIVERY
+     *
+     * @mbggenerated
+     */
+    public void setIsDelivery(String isDelivery) {
+        this.isDelivery = isDelivery == null ? null : isDelivery.trim();
+    }
 }

src/main/java/com/minpay/db/table/model/VmOrderDetailsExample.java

@@ -1204,6 +1204,84 @@ public class VmOrderDetailsExample {
             return (Criteria) this;
         }
 
+        public Criteria andIsWinningIsNull() {
+            addCriterion("VOD_IS_WINNING is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningIsNotNull() {
+            addCriterion("VOD_IS_WINNING is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningEqualTo(String value) {
+            if(value == null ){
+                andIsWinningIsNull();
+            } else {
+                addCriterion("VOD_IS_WINNING =", value, "isWinning");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningNotEqualTo(String value) {
+            if(value == null ){
+                andIsWinningIsNotNull();
+            } else {
+                addCriterion("VOD_IS_WINNING <>", value, "isWinning");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningGreaterThan(String value) {
+            addCriterion("VOD_IS_WINNING >", value, "isWinning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningGreaterThanOrEqualTo(String value) {
+            addCriterion("VOD_IS_WINNING >=", value, "isWinning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningLessThan(String value) {
+            addCriterion("VOD_IS_WINNING <", value, "isWinning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningLessThanOrEqualTo(String value) {
+            addCriterion("VOD_IS_WINNING <=", value, "isWinning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningLike(String value) {
+            addCriterion("VOD_IS_WINNING like", value, "isWinning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningNotLike(String value) {
+            addCriterion("VOD_IS_WINNING not like", value, "isWinning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningIn(List<String> values) {
+            addCriterion("VOD_IS_WINNING in", values, "isWinning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningNotIn(List<String> values) {
+            addCriterion("VOD_IS_WINNING not in", values, "isWinning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningBetween(String value1, String value2) {
+            addCriterion("VOD_IS_WINNING between", value1, value2, "isWinning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningNotBetween(String value1, String value2) {
+            addCriterion("VOD_IS_WINNING not between", value1, value2, "isWinning");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateUserIsNull() {
             addCriterion("VOD_CREATE_USER is null");
             return (Criteria) this;
@@ -1515,6 +1593,162 @@ public class VmOrderDetailsExample {
             addCriterion("VOD_MODIFY_TIME not between", value1, value2, "modifyTime");
             return (Criteria) this;
         }
+
+        public Criteria andDeliveryIdIsNull() {
+            addCriterion("VOD_DELIVERY_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdIsNotNull() {
+            addCriterion("VOD_DELIVERY_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdEqualTo(String value) {
+            if(value == null ){
+                andDeliveryIdIsNull();
+            } else {
+                addCriterion("VOD_DELIVERY_ID =", value, "deliveryId");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdNotEqualTo(String value) {
+            if(value == null ){
+                andDeliveryIdIsNotNull();
+            } else {
+                addCriterion("VOD_DELIVERY_ID <>", value, "deliveryId");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdGreaterThan(String value) {
+            addCriterion("VOD_DELIVERY_ID >", value, "deliveryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdGreaterThanOrEqualTo(String value) {
+            addCriterion("VOD_DELIVERY_ID >=", value, "deliveryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdLessThan(String value) {
+            addCriterion("VOD_DELIVERY_ID <", value, "deliveryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdLessThanOrEqualTo(String value) {
+            addCriterion("VOD_DELIVERY_ID <=", value, "deliveryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdLike(String value) {
+            addCriterion("VOD_DELIVERY_ID like", value, "deliveryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdNotLike(String value) {
+            addCriterion("VOD_DELIVERY_ID not like", value, "deliveryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdIn(List<String> values) {
+            addCriterion("VOD_DELIVERY_ID in", values, "deliveryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdNotIn(List<String> values) {
+            addCriterion("VOD_DELIVERY_ID not in", values, "deliveryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdBetween(String value1, String value2) {
+            addCriterion("VOD_DELIVERY_ID between", value1, value2, "deliveryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdNotBetween(String value1, String value2) {
+            addCriterion("VOD_DELIVERY_ID not between", value1, value2, "deliveryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryIsNull() {
+            addCriterion("VOD_IS_DELIVERY is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryIsNotNull() {
+            addCriterion("VOD_IS_DELIVERY is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryEqualTo(String value) {
+            if(value == null ){
+                andIsDeliveryIsNull();
+            } else {
+                addCriterion("VOD_IS_DELIVERY =", value, "isDelivery");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryNotEqualTo(String value) {
+            if(value == null ){
+                andIsDeliveryIsNotNull();
+            } else {
+                addCriterion("VOD_IS_DELIVERY <>", value, "isDelivery");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryGreaterThan(String value) {
+            addCriterion("VOD_IS_DELIVERY >", value, "isDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryGreaterThanOrEqualTo(String value) {
+            addCriterion("VOD_IS_DELIVERY >=", value, "isDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryLessThan(String value) {
+            addCriterion("VOD_IS_DELIVERY <", value, "isDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryLessThanOrEqualTo(String value) {
+            addCriterion("VOD_IS_DELIVERY <=", value, "isDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryLike(String value) {
+            addCriterion("VOD_IS_DELIVERY like", value, "isDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryNotLike(String value) {
+            addCriterion("VOD_IS_DELIVERY not like", value, "isDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryIn(List<String> values) {
+            addCriterion("VOD_IS_DELIVERY in", values, "isDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryNotIn(List<String> values) {
+            addCriterion("VOD_IS_DELIVERY not in", values, "isDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryBetween(String value1, String value2) {
+            addCriterion("VOD_IS_DELIVERY between", value1, value2, "isDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryNotBetween(String value1, String value2) {
+            addCriterion("VOD_IS_DELIVERY not between", value1, value2, "isDelivery");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/minpay/db/table/own/mapper/ShOrderMapper.java

@@ -11,4 +11,8 @@ public interface ShOrderMapper extends  IMINMybatisEntityMapper{
 	List<Map<String, String>> queryOrder(Map<String, String> map, MINRowBounds row);
 
     Map<String, String> queryOrderStatistics(Map<String, String> p);
+
+    List<Map<String, String>> queryOrderNew(Map<String, String> p, MINRowBounds rows);
+
+    Map<String, String> queryOrderStatisticsNew(Map<String, String> p);
 }

src/main/java/com/minpay/shouhuo/ShOrderManageAction.java

@@ -7,6 +7,7 @@ import com.minpay.common.service.ILogService;
 import com.minpay.common.service.IPublicService;
 import com.minpay.common.util.CommonUtil;
 import com.minpay.common.util.RegexUtil;
+import com.minpay.db.table.mapper.VmDeliveryInfMapper;
 import com.minpay.db.table.mapper.VmOrderDetailsMapper;
 import com.minpay.db.table.mapper.VmOrderInfMapper;
 import com.minpay.db.table.mapper.VmRechargeRuleMapper;
@@ -47,6 +48,12 @@ public class ShOrderManageAction implements IMINAction {
 	/** 订单作废 */
 	public final static String	ORDER_CANCEL				= "orderCancel";
 
+	/**查询订单（订单详情）*/
+	public final static String	QUERY_ORDERNEW				= "queryOrderNew";
+
+
+
+
 
 	/**
 	 *查询订单
@@ -141,26 +148,147 @@ public class ShOrderManageAction implements IMINAction {
 		res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getCount());
 		return res;
 	}
+
+	/**
+	 * 订单作废
+	 * @param session
+	 * @param id
+	 * @param fapRequest
+	 * @return
+	 * @throws MINBusinessException
+	 */
 	@MINAction(value = ORDER_CANCEL)
 	public MINActionResult orderCancel(
 			MINSession session,
 			@MINParam(key = "id") String id,
+			@MINParam(key = "deliveryId") String deliveryId,
 			MINHttpServletRequestContext fapRequest
 	) throws MINBusinessException {
 		MINActionResult res = new MINActionResult();
 		if (CommonUtil.isEmpty(id)){
 			throw new MINBusinessException("订单编号为空!");
 		}
-		VmOrderInf vmOrderInf = Service.lookup(IMINDataBaseService.class).getMybatisMapper(VmOrderInfMapper.class).selectByPrimaryKey(id);
+		/*VmOrderInf vmOrderInf = Service.lookup(IMINDataBaseService.class).getMybatisMapper(VmOrderInfMapper.class).selectByPrimaryKey(id);
 		if (null == vmOrderInf){
 			throw new MINBusinessException("订单信息不存在!");
 		}
 		vmOrderInf.setPickupStt("02");
 		Service.lookup(IMINDataBaseService.class)
 				.getMybatisMapper(VmOrderInfMapper.class)
-				.updateByPrimaryKeySelective(vmOrderInf);
+				.updateByPrimaryKeySelective(vmOrderInf);*/
+
+		VmOrderDetails vmOrderDetails = Service.lookup(IMINDataBaseService.class).getMybatisMapper(VmOrderDetailsMapper.class).selectByPrimaryKey(id);
+		if (null == vmOrderDetails){
+			throw new MINBusinessException("订单信息不存在!");
+		}
+		if(!vmOrderDetails.getDeliveryId().equals(deliveryId)){
+			throw new MINBusinessException("提货单号和此订单不一致!");
+		}
+		VmDeliveryInf vmDeliveryInf = Service.lookup(IMINDataBaseService.class).getMybatisMapper(VmDeliveryInfMapper.class).selectByPrimaryKey(deliveryId);
+		if (null == vmDeliveryInf){
+			throw new MINBusinessException("提货编号不存在!");
+		}
+		if (!"0".equals(vmDeliveryInf.getStatus()) && !"1".equals(vmDeliveryInf.getStatus()) && !"3".equals(vmDeliveryInf.getStatus()) ){
+			throw new MINBusinessException("货物已提出!");
+		}
 
+		vmOrderDetails.setIsDelivery("02");
+		Service.lookup(IMINDataBaseService.class)
+				.getMybatisMapper(VmOrderDetailsMapper.class)
+				.updateByPrimaryKeySelective(vmOrderDetails);
+		vmDeliveryInf.setStatus("6");
+		Service.lookup(IMINDataBaseService.class)
+				.getMybatisMapper(VmDeliveryInfMapper.class)
+				.updateByPrimaryKeySelective(vmDeliveryInf);
 		// 设置返回值
 		return res;
 	}
+
+	/**
+	 *新查询订单
+	 * @param session
+	 * @param page
+	 * @param limit
+	 * @param equipmentId	机器编号		1
+	 * @param equipmentName
+	 * @param freightwayId	货道编号		1
+	 * @param payMode		支付方式		1
+	 * @param dates			日期（区间）	1
+	 * @param playerId
+	 * @param playerName	玩家名称		1
+	 * @param state			支付状态		1
+	 * @param orderNo		订单号		1
+	 * @param isDraw		是否中奖
+	 * @param productName	商品名称		1
+	 * @param gameRule		购买方式		1
+	 * @param deliveryId	出货编号    1
+	 * @param fapRequest
+	 * @return
+	 * @throws MINBusinessException
+	 */
+	@MINAction(value = QUERY_ORDERNEW)
+	public MINActionResult queryOrderNew(
+			MINSession session,
+			@MINParam(key = "page", defaultValue = "1") int page,
+			@MINParam(key = "limit", defaultValue = "3") int limit,
+			@MINParam(key = "equipmentId") String equipmentId,
+			@MINParam(key = "equipmentName") String equipmentName,
+			@MINParam(key = "freightwayId") String freightwayId,
+			@MINParam(key = "payMode") String payMode,
+			@MINParam(key = "dates") String dates,
+			@MINParam(key = "playerId") String playerId,
+			@MINParam(key = "playerName") String playerName,
+			@MINParam(key = "state") String state,
+			@MINParam(key = "orderNo") String orderNo,
+			@MINParam(key = "isDraw") String isDraw,
+			@MINParam(key = "productName") String productName,
+			@MINParam(key = "gameRule") String gameRule,
+			@MINParam(key = "deliveryId") String deliveryId,
+			@MINParam(key = "pickupStt") String pickupStt,
+			MINHttpServletRequestContext fapRequest
+	) throws MINBusinessException {
+		MINActionResult res = new MINActionResult();
+		MINRowBounds rows = new MINRowBounds(page, limit);
+		// 创建查询条件
+		Map<String, String> p = new HashMap<String, String>();
+		p.put("equipmentId",equipmentId);
+		p.put("equipmentName",equipmentName);
+		p.put("freightwayId",freightwayId);
+		p.put("payMode",payMode);
+		p.put("playerId",playerId);
+		p.put("state",state);
+		p.put("dates", dates);
+		p.put("orderNo", orderNo);
+		p.put("playerName", playerName);
+		p.put("isDraw", isDraw);
+		p.put("productName", productName);
+		p.put("gameRule", gameRule);
+		p.put("deliveryId", deliveryId);
+		p.put("pickupStt", pickupStt);
+		User user = session.getUser();
+		if(!user.getBranchId().equals(Constant.ADMINISTRATION_SYSTEM_NUMBER)){
+			p.put("branchId", user.getBranchId());
+		}
+
+		// 查询OrderInfMapper.xml
+		List<Map<String, String>> ls = Service.lookup(IMINDataBaseService.class).getMybatisMapper(ShOrderMapper.class).queryOrderNew(p,rows);
+		// 格式化
+		ls = Service.lookup(IFormatService.class).formatDateTime(ls, "createTime");
+		ls = new MINCopyFormat("{isDraw:'isDrawdesc',payMode:'payModedesc','state':'statedesc','pickupStt':'pickupSttdesc'}").format(ls);
+		ls = Service.lookup(IFormatService.class).formatEnum(ls, "{isDrawdesc:'IS_DRAW',payModedesc:'PAY_TYPE',statedesc:'ORDER_STATE',pickupSttdesc:'ORDER_PICKUP_STT'}");
+
+
+		Map<String, String> lss = Service.lookup(IMINDataBaseService.class).getMybatisMapper(ShOrderMapper.class).queryOrderStatisticsNew(p);
+
+		res.set("statistics", lss);
+		// 设置返回值
+		res.set(IMINBusinessConstant.F_PAGING_LAY, ls);
+		res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getCount());
+		return res;
+	}
+
+
+
+
+
 }

src/main/resources/com/minpay/db/table/mapper/VmOrderDetailsMapper.xml

@@ -19,10 +19,13 @@
     <result column="VOD_AMOUNT" jdbcType="VARCHAR" property="amount" />
     <result column="VOD_RECORD_ID" jdbcType="VARCHAR" property="recordId" />
     <result column="VOD_REMARKS" jdbcType="VARCHAR" property="remarks" />
+    <result column="VOD_IS_WINNING" jdbcType="VARCHAR" property="isWinning" />
     <result column="VOD_CREATE_USER" jdbcType="VARCHAR" property="createUser" />
     <result column="VOD_CREATE_TIME" jdbcType="VARCHAR" property="createTime" />
     <result column="VOD_MODIFY_USER" jdbcType="VARCHAR" property="modifyUser" />
     <result column="VOD_MODIFY_TIME" jdbcType="VARCHAR" property="modifyTime" />
+    <result column="VOD_DELIVERY_ID" jdbcType="VARCHAR" property="deliveryId" />
+    <result column="VOD_IS_DELIVERY" jdbcType="VARCHAR" property="isDelivery" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -97,7 +100,8 @@
     -->
     VOD_DETAILS_ID, VOD_CHANNEL, VOD_ORDER_ID, VOD_PRO_EQU_REL_ID, VOD_CARGO_WAY, VOD_PRODUCT_ID, 
     VOD_PRO_TYPE, VOD_PRO_NAME, VOD_PRO_PRICE, VOD_PRO_NUMS, VOD_AMOUNT, VOD_RECORD_ID, 
-    VOD_REMARKS, VOD_CREATE_USER, VOD_CREATE_TIME, VOD_MODIFY_USER, VOD_MODIFY_TIME
+    VOD_REMARKS, VOD_IS_WINNING, VOD_CREATE_USER, VOD_CREATE_TIME, VOD_MODIFY_USER, VOD_MODIFY_TIME, 
+    VOD_DELIVERY_ID, VOD_IS_DELIVERY
   </sql>
   <select id="selectByExample" parameterType="com.minpay.db.table.model.VmOrderDetailsExample" resultMap="BaseResultMap">
     <!--
@@ -154,14 +158,16 @@
       VOD_PRO_EQU_REL_ID, VOD_CARGO_WAY, VOD_PRODUCT_ID, 
       VOD_PRO_TYPE, VOD_PRO_NAME, VOD_PRO_PRICE, 
       VOD_PRO_NUMS, VOD_AMOUNT, VOD_RECORD_ID, 
-      VOD_REMARKS, VOD_CREATE_USER, VOD_CREATE_TIME, 
-      VOD_MODIFY_USER, VOD_MODIFY_TIME)
+      VOD_REMARKS, VOD_IS_WINNING, VOD_CREATE_USER, 
+      VOD_CREATE_TIME, VOD_MODIFY_USER, VOD_MODIFY_TIME, 
+      VOD_DELIVERY_ID, VOD_IS_DELIVERY)
     values (#{detailsId,jdbcType=VARCHAR}, #{channel,jdbcType=VARCHAR}, #{orderId,jdbcType=VARCHAR}, 
       #{proEquRelId,jdbcType=VARCHAR}, #{cargoWay,jdbcType=VARCHAR}, #{productId,jdbcType=VARCHAR}, 
       #{proType,jdbcType=VARCHAR}, #{proName,jdbcType=VARCHAR}, #{proPrice,jdbcType=VARCHAR}, 
       #{proNums,jdbcType=VARCHAR}, #{amount,jdbcType=VARCHAR}, #{recordId,jdbcType=VARCHAR}, 
-      #{remarks,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, 
-      #{modifyUser,jdbcType=VARCHAR}, #{modifyTime,jdbcType=VARCHAR})
+      #{remarks,jdbcType=VARCHAR}, #{isWinning,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=VARCHAR}, #{modifyUser,jdbcType=VARCHAR}, #{modifyTime,jdbcType=VARCHAR}, 
+      #{deliveryId,jdbcType=VARCHAR}, #{isDelivery,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.minpay.db.table.model.VmOrderDetails">
     <!--
@@ -209,6 +215,9 @@
       <if test="remarks != null">
         VOD_REMARKS,
       </if>
+      <if test="isWinning != null">
+        VOD_IS_WINNING,
+      </if>
       <if test="createUser != null">
         VOD_CREATE_USER,
       </if>
@@ -221,6 +230,12 @@
       <if test="modifyTime != null">
         VOD_MODIFY_TIME,
       </if>
+      <if test="deliveryId != null">
+        VOD_DELIVERY_ID,
+      </if>
+      <if test="isDelivery != null">
+        VOD_IS_DELIVERY,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="detailsId != null">
@@ -262,6 +277,9 @@
       <if test="remarks != null">
         #{remarks,jdbcType=VARCHAR},
       </if>
+      <if test="isWinning != null">
+        #{isWinning,jdbcType=VARCHAR},
+      </if>
       <if test="createUser != null">
         #{createUser,jdbcType=VARCHAR},
       </if>
@@ -274,6 +292,12 @@
       <if test="modifyTime != null">
         #{modifyTime,jdbcType=VARCHAR},
       </if>
+      <if test="deliveryId != null">
+        #{deliveryId,jdbcType=VARCHAR},
+      </if>
+      <if test="isDelivery != null">
+        #{isDelivery,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.minpay.db.table.model.VmOrderDetailsExample" resultType="java.lang.Integer">
@@ -332,6 +356,9 @@
       <if test="record.remarks != null">
         VOD_REMARKS = #{record.remarks,jdbcType=VARCHAR},
       </if>
+      <if test="record.isWinning != null">
+        VOD_IS_WINNING = #{record.isWinning,jdbcType=VARCHAR},
+      </if>
       <if test="record.createUser != null">
         VOD_CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
       </if>
@@ -344,6 +371,12 @@
       <if test="record.modifyTime != null">
         VOD_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR},
       </if>
+      <if test="record.deliveryId != null">
+        VOD_DELIVERY_ID = #{record.deliveryId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.isDelivery != null">
+        VOD_IS_DELIVERY = #{record.isDelivery,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -368,10 +401,13 @@
       VOD_AMOUNT = #{record.amount,jdbcType=VARCHAR},
       VOD_RECORD_ID = #{record.recordId,jdbcType=VARCHAR},
       VOD_REMARKS = #{record.remarks,jdbcType=VARCHAR},
+      VOD_IS_WINNING = #{record.isWinning,jdbcType=VARCHAR},
       VOD_CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
       VOD_CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
       VOD_MODIFY_USER = #{record.modifyUser,jdbcType=VARCHAR},
-      VOD_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR}
+      VOD_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR},
+      VOD_DELIVERY_ID = #{record.deliveryId,jdbcType=VARCHAR},
+      VOD_IS_DELIVERY = #{record.isDelivery,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -419,6 +455,9 @@
       <if test="remarks != null">
         VOD_REMARKS = #{remarks,jdbcType=VARCHAR},
       </if>
+      <if test="isWinning != null">
+        VOD_IS_WINNING = #{isWinning,jdbcType=VARCHAR},
+      </if>
       <if test="createUser != null">
         VOD_CREATE_USER = #{createUser,jdbcType=VARCHAR},
       </if>
@@ -431,6 +470,12 @@
       <if test="modifyTime != null">
         VOD_MODIFY_TIME = #{modifyTime,jdbcType=VARCHAR},
       </if>
+      <if test="deliveryId != null">
+        VOD_DELIVERY_ID = #{deliveryId,jdbcType=VARCHAR},
+      </if>
+      <if test="isDelivery != null">
+        VOD_IS_DELIVERY = #{isDelivery,jdbcType=VARCHAR},
+      </if>
     </set>
     where VOD_DETAILS_ID = #{detailsId,jdbcType=VARCHAR}
   </update>
@@ -452,10 +497,13 @@
       VOD_AMOUNT = #{amount,jdbcType=VARCHAR},
       VOD_RECORD_ID = #{recordId,jdbcType=VARCHAR},
       VOD_REMARKS = #{remarks,jdbcType=VARCHAR},
+      VOD_IS_WINNING = #{isWinning,jdbcType=VARCHAR},
       VOD_CREATE_USER = #{createUser,jdbcType=VARCHAR},
       VOD_CREATE_TIME = #{createTime,jdbcType=VARCHAR},
       VOD_MODIFY_USER = #{modifyUser,jdbcType=VARCHAR},
-      VOD_MODIFY_TIME = #{modifyTime,jdbcType=VARCHAR}
+      VOD_MODIFY_TIME = #{modifyTime,jdbcType=VARCHAR},
+      VOD_DELIVERY_ID = #{deliveryId,jdbcType=VARCHAR},
+      VOD_IS_DELIVERY = #{isDelivery,jdbcType=VARCHAR}
     where VOD_DETAILS_ID = #{detailsId,jdbcType=VARCHAR}
   </update>
 </mapper>

src/main/resources/com/minpay/db/table/own/mapper/ShOrderMapper.xml

@@ -83,9 +83,9 @@
 		<if test="equipmentName != null and equipmentName != ''">
 			and c.VEQ_NAME like CONCAT('%', #{equipmentName,jdbcType=VARCHAR}, '%')
 		</if>
-		<if test="freightwayId != null and freightwayId != ''">
+		<!--<if test="freightwayId != null and freightwayId != ''">
 			and a.VOI_EQUREL_ID = #{freightwayId,jdbcType=VARCHAR}
-		</if>
+		</if>-->
 		<if test="payMode != null and payMode != ''">
 			and a.VOI_PAY_MODE = #{payMode,jdbcType=VARCHAR}
 		</if>
@@ -103,6 +103,138 @@
 		</if>
 		order by  a.VOI_CREATE_TIME desc
 	</select>
+	<select id="queryOrderStatisticsNew" resultType="hashmap" parameterType="java.lang.String">
+		SELECT
+		count(1)  number,
+		IFNULL(sum(d.VOD_AMOUNT),0)	sumAmt
+		FROM vm_order_details d LEFT JOIN   vm_order_inf a  ON d.VOD_ORDER_ID = a.VOI_ID
+		LEFT JOIN  vm_equipment_inf c ON a.VOI_EQUIPMENT_ID = c.VEQ_ID
+		LEFT JOIN vm_person_inf b ON a.VOI_PERSON_ID = b.VCI_ID
+		LEFT JOIN vm_pro_equ_rel e ON d.VOD_PRO_EQU_REL_ID = e.VCI_ID
+		WHERE 1=1 and a.VOI_OPERATION = '0'
+		<if test="dates!=null and dates != ''">
+			and substr(d.VOD_CREATE_TIME,1,8) between substr((#{dates,jdbcType=VARCHAR}),1,8)
+			and substr((#{dates,jdbcType=VARCHAR}),12,19)
+		</if>
+		<if test="equipmentId != null and equipmentId != ''">
+			and c.VEQ_IMEI_ADDR = #{equipmentId,jdbcType=VARCHAR}
+		</if>
+		<if test="equipmentName != null and equipmentName != ''">
+			and c.VEQ_NAME like CONCAT('%', #{equipmentName,jdbcType=VARCHAR}, '%')
+		</if>
+		<if test="freightwayId != null and freightwayId != ''">
+			and e.VCI_AISLE = #{freightwayId,jdbcType=VARCHAR}
+		</if>
+		<if test="payMode != null and payMode != ''">
+			and a.VOI_PAY_MODE = #{payMode,jdbcType=VARCHAR}
+		</if>
+		<if test="playerId != null and playerId != ''">
+			and a.VOI_PERSON_ID = #{playerId,jdbcType=VARCHAR}
+		</if>
+		<if test="state != null and state != ''">
+			and a.VOI_STATE = #{state,jdbcType=VARCHAR}
+		</if>
+		<if test="playerName != null and playerName != ''">
+			and b.VCI_NAME = #{playerName,jdbcType=VARCHAR}
+		</if>
+		<if test="isDraw != null and isDraw != ''">
+			and d.VOD_IS_WINNING = #{isDraw,jdbcType=VARCHAR}
+		</if>
+		<if test="orderNo != null and orderNo != ''">
+			and d.VOD_DETAILS_ID = #{orderNo,jdbcType=VARCHAR}
+		</if>
+		<if test="productName != null and productName != ''">
+			and d.VOD_PRO_NAME like CONCAT('%', #{productName,jdbcType=VARCHAR}, '%')
+		</if>
+		<if test="gameRule != null and gameRule != ''">
+			and a.VOI_GAME_RULE = #{gameRule,jdbcType=VARCHAR}
+		</if>
+		<if test="pickupStt != null and pickupStt != ''">
+			and d.VOD_IS_DELIVERY = #{pickupStt,jdbcType=VARCHAR}
+		</if>
+		<if test="deliveryId != null and deliveryId != ''">
+			and d.VOD_DELIVERY_ID = #{deliveryId,jdbcType=VARCHAR}
+		</if>
+		<if test="branchId != null and branchId != ''">
+			and a.VOI_BRANCHID = #{branchId,jdbcType=VARCHAR}
+		</if>
+		order by  d.VOD_CREATE_TIME desc
+	</select>
+
+	<select id="queryOrderNew" resultType="hashmap" parameterType="java.lang.String">
+		SELECT
+		d.VOD_DETAILS_ID		"id",
+		d.VOD_DELIVERY_ID		"deliveryId",
+		d.VOD_CREATE_TIME		"createTime",
+		a.VOI_EQUIPMENT_ID      "equipmentId",
+		c.VEQ_IMEI_ADDR			"imeiAddr",
+		d.VOD_PRO_NAME			"productName",
+		d.VOD_AMOUNT			"orderAmt",
+		e.VCI_AISLE				"aisle",
+		e.VCI_COST_PRICE		"costPrice",
+		a.VOI_STATE				"state",
+		a.VOI_PAY_MODE	    	"payMode",
+		a.VOI_GAME_RULE			"gameRule",
+		d.VOD_IS_DELIVERY		"pickupStt",
+		b.VCI_NAME  			"personName",
+		d.VOD_IS_WINNING		"isDraw"
+		FROM vm_order_details d LEFT JOIN   vm_order_inf a  ON d.VOD_ORDER_ID = a.VOI_ID
+		LEFT JOIN  vm_equipment_inf c ON a.VOI_EQUIPMENT_ID = c.VEQ_ID
+		LEFT JOIN vm_person_inf b ON a.VOI_PERSON_ID = b.VCI_ID
+		LEFT JOIN vm_pro_equ_rel e ON d.VOD_PRO_EQU_REL_ID = e.VCI_ID
+		WHERE 1=1 and a.VOI_OPERATION = '0'
+		<if test="dates!=null and dates != ''">
+			and substr(d.VOD_CREATE_TIME,1,8) between substr((#{dates,jdbcType=VARCHAR}),1,8)
+			and substr((#{dates,jdbcType=VARCHAR}),12,19)
+		</if>
+		<if test="equipmentId != null and equipmentId != ''">
+			and c.VEQ_IMEI_ADDR = #{equipmentId,jdbcType=VARCHAR}
+		</if>
+		<if test="equipmentName != null and equipmentName != ''">
+			and c.VEQ_NAME like CONCAT('%', #{equipmentName,jdbcType=VARCHAR}, '%')
+		</if>
+		<if test="freightwayId != null and freightwayId != ''">
+			and e.VCI_AISLE = #{freightwayId,jdbcType=VARCHAR}
+		</if>
+		<if test="payMode != null and payMode != ''">
+			and a.VOI_PAY_MODE = #{payMode,jdbcType=VARCHAR}
+		</if>
+		<if test="playerId != null and playerId != ''">
+			and a.VOI_PERSON_ID = #{playerId,jdbcType=VARCHAR}
+		</if>
+		<if test="state != null and state != ''">
+			and a.VOI_STATE = #{state,jdbcType=VARCHAR}
+		</if>
+		<if test="playerName != null and playerName != ''">
+			and b.VCI_NAME = #{playerName,jdbcType=VARCHAR}
+		</if>
+		<if test="isDraw != null and isDraw != ''">
+			and d.VOD_IS_WINNING = #{isDraw,jdbcType=VARCHAR}
+		</if>
+		<if test="orderNo != null and orderNo != ''">
+			and d.VOD_DETAILS_ID = #{orderNo,jdbcType=VARCHAR}
+		</if>
+		<if test="productName != null and productName != ''">
+			and d.VOD_PRO_NAME like CONCAT('%', #{productName,jdbcType=VARCHAR}, '%')
+		</if>
+		<if test="gameRule != null and gameRule != ''">
+			and a.VOI_GAME_RULE = #{gameRule,jdbcType=VARCHAR}
+		</if>
+		<if test="pickupStt != null and pickupStt != ''">
+			and d.VOD_IS_DELIVERY = #{pickupStt,jdbcType=VARCHAR}
+		</if>
+		<if test="deliveryId != null and deliveryId != ''">
+			and d.VOD_DELIVERY_ID = #{deliveryId,jdbcType=VARCHAR}
+		</if>
+		<if test="branchId != null and branchId != ''">
+			and a.VOI_BRANCHID = #{branchId,jdbcType=VARCHAR}
+		</if>
+		order by  d.VOD_CREATE_TIME desc
+	</select>
+
+
+
+
 
 
 </mapper>

src/main/webapp/admin/orderManage/orderManage.html

@@ -25,39 +25,46 @@
 		<div class="order-select back-border" id="content">
 
 			<div class="layui-inline">
-				<label class="f12-gray4">订单编号：</label>
 				<input onchange = "changeSelectCon(0,this,'inp')" class="search-select" type="tel" name="orderNo"  id ="orderNo" lay-verify="orderNo"  autocomplete="off" placeholder="请输入订单编号" class="y-left-input">
 			</div>
 			<div class="layui-inline">
-				<label class="f12-gray4">创建时间：</label>
 				<input  class="search-select" type="text"  id="dates" placeholder="日期（区间）"   readonly />
 			</div>
 			<div class="layui-inline">
-				<label class="f12-gray4">状态：</label>
 				<div  class=""  style="display:inline-block" id = 'state'></div>
 			</div>
 
 			<div class="layui-inline">
-				<label class="f12-gray4">机台号：</label>
-				<input onchange = "changeSelectCon(3,this,'inp')"   class="search-select" type="tel" name="equipmentId"  id ="equipmentId" lay-verify="equipmentId"  autocomplete="off" placeholder="请输入机器号" class="layui-input">
+				<input onchange = "changeSelectCon(3,this,'inp')"   class="search-select" type="tel" name="equipmentId"  id ="equipmentId" lay-verify="equipmentId"  autocomplete="off" placeholder="请输入设备编号" class="layui-input">
 			</div>
-			<div class="d-dashed" style="margin: 10px 0;"></div>
+
 			<div class="layui-inline">
-				<label class="f12-gray4">机器名称：</label>
-				<input onchange = "changeSelectCon(4,this,'inp')"   class="search-select" type="tel" name="equipmentName"  id ="equipmentName" lay-verify="equipmentName"  autocomplete="off" placeholder="请输入机器名称" class="layui-input">
+				<input onchange = "changeSelectCon(4,this,'inp')"   class="search-select" type="tel" name="playerName"  id ="playerName" lay-verify="playerName"  autocomplete="off" placeholder="请输入玩家名称" class="layui-input">
 			</div>
-			<!--<div class="layui-inline">
-				<label class="f12-gray4">货道号：</label>
+			<div class="layui-inline">
 				<input onchange = "changeSelectCon(5,this,'inp')"   class="search-select" type="tel" name="freightwayId"  id ="freightwayId" lay-verify="freightwayId"  autocomplete="off" placeholder="请输入货道号" class="layui-input">
-			</div>-->
+			</div>
+			<DIV class="d-dashed" style="margin: 10px 0;"></DIV>
 			<div class="layui-inline">
-				<label class="f12-gray4">支付方式：</label>
 				<div  class=""  style="display:inline-block" id = 'payMode'></div>
 			</div>
 			<div class="layui-inline">
-				<label class="f12-gray4">玩家ID：</label>
-				<input onchange = "changeSelectCon(7,this,'inp')"   class="search-select" type="tel" name="personId"  id ="personId" lay-verify="personId"  autocomplete="off" placeholder="请输入玩家ID" class="layui-input">
+				<input onchange = "changeSelectCon(7,this,'inp')"   class="search-select" type="tel" name="productName"  id ="productName" lay-verify="productName"  autocomplete="off" placeholder="请输入商品名称" class="layui-input">
+			</div>
+			<div class="layui-inline">
+				<div  class=""  style="display:inline-block" id = 'gameRule'></div>
+			</div>
+			<div class="layui-inline">
+				<div  class=""  style="display:inline-block" id = 'pickupStt'></div>
 			</div>
+			<div class="layui-inline">
+				<div  class=""  style="display:inline-block" id = 'isDraw'></div>
+			</div>
+			<div class="layui-inline">
+				<input onchange = "changeSelectCon(11,this,'inp')"   class="search-select" type="tel" name="deliveryId"  id ="deliveryId" lay-verify="deliveryId"  autocomplete="off" placeholder="请输入提货编号" class="layui-input">
+			</div>
+
+
 			<div class="d-dashed" style="margin: 10px 0;"></div>
 			<div class="layui-inline">
 				<label class="f12-gray4">总销售金额:</label>
@@ -85,8 +92,8 @@
 <script src="../../js/min-loader-next.js"></script>
 <script type="text/html" id="barDemo">
 	<!--<a class="layui-btn layui-btn-xs" lay-event="look">订单详情</a>-->
-	{{#  if(d.state == '00' && d.isUsed == '01' && d.pickupStt == '00' ){ }}
-	<a class="layui-btn layui-btn-xs" lay-event="cancel">订单作废</a>
+	{{#  if(d.state == '00' && d.pickupStt == '00' ){ }}
+	<a class="layui-btn layui-btn-xs" lay-event="cancel">作废</a>
 	{{#  } }}
 </script>
 <script>
@@ -107,14 +114,28 @@
 			}
 		});
 		form = layui.form;
-		initSelect('state', "IS_DRAW", "state", '', true);
-		initSelect('payMode', "PAY_TYPE", "payMode", '', true);
+		initSelect('state', "PAY_STATE", "state", '', true,'支付状态');
+		initSelect('payMode', "PAY_MODE", "payMode", '', true,'支付方式');
+		initSelect('gameRule', "GAME_RULE", "gameRule", '', true,'购买方式');
+		initSelect('pickupStt', "PICKUP_STT", "pickupStt", '', true,'出货状态');
+		initSelect('isDraw', "IS_DRAW", "isDraw", '', true,'是否中奖');
 		form.on('select(state)', function(data){
 			changeSelectCon(2, data.elem, "sel","state");
 		});
 		form.on('select(payMode)', function(data){
 			changeSelectCon(6, data.elem, "sel","payMode");
 		});
+		form.on('select(gameRule)', function(data){
+			changeSelectCon(8, data.elem, "sel","gameRule");
+		});
+		form.on('select(pickupStt)', function(data){
+			changeSelectCon(9, data.elem, "sel","pickupStt");
+		});
+		form.on('select(isDraw)', function(data){
+			changeSelectCon(10, data.elem, "sel","isDraw");
+		});
+
+
 		form.render();
 	});
 	var table;
@@ -126,24 +147,26 @@
 			,elem: '#orderManage'
 			,limit:10
 			// ,height: 315
-			,url: 'ShOrderManageAction/queryOrder' //数据接口
+			,url: 'ShOrderManageAction/queryOrderNew' //数据接口
 			,method: 'post'
 			,where:{MINView:"JSON"}
 			,page: true //开启分页
 			,cols: [[ //表头
 				{field:'num', title: '序号',width:'5%', type:'numbers', fixed: true, align: 'center'}
-				,{field: 'id', title: '编号', width:'10%', sort: true, fixed: 'left'}
-				,{field: 'productName', title: '产品信息', width:'12%'}
-				,{field: 'equipmentId', title: '机器编号', width:'8%'}
-				,{field: 'equipmentName', title: '机器名称', width:'8%'}
-				//,{field: 'equrelId', title: '货道编号', width:'8%'}
-				,{field: 'personId', title: '玩家ID', width:'8%'}
-				,{field: 'personName', title: '消费者信息', width:'8%'}
-				,{field: 'isDrawdesc', title: '状态', width:'8%'}
-				,{field: 'pickupSttdesc', title: '取货状态', width:'8%'}
-				,{field: 'payModedesc', title: '支付类型', width:'8%'}
+				,{field: 'id', title: '订单号', width:'8%', sort: true, fixed: 'left'}
+				,{field: 'deliveryId', title: '提货编号', width:'10%'}
+				,{field: 'productName', title: '商品名称', width:'10%'}
 				,{field: 'orderAmt', title: '订单价格', width:'8%'}
-				,{field: 'createTime', title: '创建时间', width: '14%'}
+				,{field: 'costPrice', title: '成本', width:'5%'}
+				/*,{field: 'equipmentId', title: '机器编号', width:'8%'}*/
+				,{field: 'imeiAddr', title: '设备编号', width:'6%'}
+				,{field: 'aisle', title: '货道编号', width:'6%'}
+				,{field: 'personName', title: '消费者信息', width:'8%'}
+				,{field: 'statedesc', title: '支付状态', width:'6%'}
+				,{field: 'isDrawdesc', title: '是否中奖', width:'6%'}
+				,{field: 'pickupSttdesc', title: '取货状态', width:'6%'}
+				,{field: 'payModedesc', title: '支付类型', width:'6%'}
+				,{field: 'createTime', title: '创建时间', width: '12%'}
 				,{field: 'operate', title: '操作', width: '8%', toolbar: '#barDemo',fixed: 'right'}
 			]]
 			,done: function(res, curr, count){
@@ -173,7 +196,8 @@
 					$.request({
 						action : '../../ShOrderManageAction/orderCancel',
 						data : {
-							id : id ,//订单id
+							id : data.id ,//订单id
+							deliveryId : data.deliveryId
 						},
 						success : function(data) {
 							//成功后刷新
@@ -235,18 +259,24 @@
 
 
 	function loadAA() {
-		//状态
-		var state = $("#state").find("option:selected").val();
+
 		//时间
 		var dates = $("#dates").val();
 		//订单号
 		var orderNo = $("#orderNo").val();
-
 		var equipmentId = $("#equipmentId").val();
-		var equipmentName = $("#equipmentName").val();
+		var playerName = $("#playerName").val();
 		var freightwayId = $("#freightwayId").val();
+		var productName = $("#productName").val();
+		var deliveryId = $("#deliveryId").val();
+		var gameRule = $("#gameRule").find("option:selected").val();
+		var state = $("#state").find("option:selected").val();
+		var isDraw = $("#isDraw").find("option:selected").val();
 		var payMode = $("#payMode").find("option:selected").val();
-		var playerId = $("#personId").val();
+		var pickupStt = $("#pickupStt").find("option:selected").val();
+
+		//状态
+		var state = $("#state").find("option:selected").val();
 		//执行重载
 		table.reload('orderManage', {
 			page: {
@@ -257,10 +287,14 @@
 				state : state,
 				dates : dates,
 				equipmentId : equipmentId,
-				equipmentName : equipmentName,
+				playerName : playerName,
 				freightwayId : freightwayId,
 				payMode : payMode,
-				playerId : playerId
+				isDraw:isDraw,
+				productName : productName,
+				gameRule : gameRule,
+				deliveryId : deliveryId,
+				pickupStt : pickupStt
 			}
 		});
 	}
@@ -296,7 +330,7 @@
 			}
 		}
 	}
-	var array = new Array('订单编号','创建时间','状态','机台号','机器名称','货道号','支付方式','玩家ID');
+	var array = new Array('订单编号','创建时间','支付状态','设备编号','玩家名称','货道号','支付方式','商品名称','购买方式','出货状态','是否中奖','提货编号');
 	function getSelectConHtml(index, t, type,dateValue){
 		var name;
 		var value;
@@ -313,6 +347,15 @@
 			if(index == '6'){
 				value = $("#payMode").find("option:selected").text();
 			}
+			if(index == '8'){
+				value = $("#gameRule").find("option:selected").text();
+			}
+			if(index == '9'){
+				value = $("#pickupStt").find("option:selected").text();
+			}
+			if(index == '10'){
+				value = $("#isDraw").find("option:selected").text();
+			}
 
 		}
 		if (type == "date") {
@@ -331,8 +374,11 @@
 	}
 	function removeSearch(t) {
 		if ($(t).attr("name") == 'subjects') {
-			initSelect('state', "IS_DRAW", "state", ' ', true);
-			initSelect('payMode', "PAY_TYPE", "payMode", ' ', true);
+			initSelect('state', "PAY_STATE", "state", '', true,'支付状态');
+			initSelect('payMode', "PAY_MODE", "payMode", '', true,'支付方式');
+			initSelect('gameRule', "GAME_RULE", "gameRule", '', true,'购买方式');
+			initSelect('pickupStt', "ORDER_PICKUP_STT", "pickupStt", '', true,'出货状态');
+			initSelect('isDraw', "IS_DRAW", "isDraw", '', true,'是否中奖');
 			form.render();
 			$(t).remove();
 		} else {

src/main/webapp/js/min.js

@@ -578,12 +578,14 @@ exInitRoleBsnParam();
  * @param selectOption 默认选择的选项
  * @param isSearchSelect 是否是可以搜搜的选择框
  */
-function initSelect(id, paramKey, selectName, selectOption, isSearchSelect) {
+function initSelect(id, paramKey, selectName, selectOption, isSearchSelect,optionName) {
 	var selectVal = getAppParam(paramKey);
 	if(isEmpty(selectVal)) {
 		return false;
 	}
-	
+	if(isEmpty(optionName)) {
+		optionName ='请选择';
+	}
 	var html = '<select name="';
 	html = html + selectName;
 	html = html + '" lay-filter="'+selectName+'" lay-verify="'+selectName+'';
@@ -592,7 +594,7 @@ function initSelect(id, paramKey, selectName, selectOption, isSearchSelect) {
 	if(isSearchSelect) {
 		html = html + 'lay-search=""';
 	}
-	html = html + '><option value=""></option>';
+	html = html + '><option value="">'+optionName+'</option>';
 	for(var k in selectVal){  //通过定义一个局部变量k遍历获取到了map中所有的key值  
 		  var itemVal = selectVal[k]; //获取到了key所对应的value的值！   
 		  html = html + '<option ';