订单表

src/main/java/com/minpay/db/table/mapper/VmOrderInfMapper.java

@@ -0,0 +1,97 @@
+package com.minpay.db.table.mapper;
+
+import com.minpay.db.table.model.VmOrderInf;
+import com.minpay.db.table.model.VmOrderInfExample;
+import com.startup.minpay.frame.jdbc.IMINMybatisEntityMapper;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface VmOrderInfMapper extends IMINMybatisEntityMapper<VmOrderInf, String, VmOrderInfExample> {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_order_inf
+     *
+     * @mbggenerated
+     */
+    int countByExample(VmOrderInfExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_order_inf
+     *
+     * @mbggenerated
+     */
+    int deleteByExample(VmOrderInfExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_order_inf
+     *
+     * @mbggenerated
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_order_inf
+     *
+     * @mbggenerated
+     */
+    int insert(VmOrderInf record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_order_inf
+     *
+     * @mbggenerated
+     */
+    int insertSelective(VmOrderInf record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_order_inf
+     *
+     * @mbggenerated
+     */
+    List<VmOrderInf> selectByExample(VmOrderInfExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_order_inf
+     *
+     * @mbggenerated
+     */
+    VmOrderInf selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_order_inf
+     *
+     * @mbggenerated
+     */
+    int updateByExampleSelective(@Param("record") VmOrderInf record, @Param("example") VmOrderInfExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_order_inf
+     *
+     * @mbggenerated
+     */
+    int updateByExample(@Param("record") VmOrderInf record, @Param("example") VmOrderInfExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_order_inf
+     *
+     * @mbggenerated
+     */
+    int updateByPrimaryKeySelective(VmOrderInf record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_order_inf
+     *
+     * @mbggenerated
+     */
+    int updateByPrimaryKey(VmOrderInf record);
+}

src/main/java/com/minpay/db/table/mapper/VmProEquRelMapper.java

@@ -0,0 +1,97 @@
+package com.minpay.db.table.mapper;
+
+import com.minpay.db.table.model.VmProEquRel;
+import com.minpay.db.table.model.VmProEquRelExample;
+import com.startup.minpay.frame.jdbc.IMINMybatisEntityMapper;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface VmProEquRelMapper extends IMINMybatisEntityMapper<VmProEquRel, String, VmProEquRelExample> {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_pro_equ_rel
+     *
+     * @mbggenerated
+     */
+    int countByExample(VmProEquRelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_pro_equ_rel
+     *
+     * @mbggenerated
+     */
+    int deleteByExample(VmProEquRelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_pro_equ_rel
+     *
+     * @mbggenerated
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_pro_equ_rel
+     *
+     * @mbggenerated
+     */
+    int insert(VmProEquRel record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_pro_equ_rel
+     *
+     * @mbggenerated
+     */
+    int insertSelective(VmProEquRel record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_pro_equ_rel
+     *
+     * @mbggenerated
+     */
+    List<VmProEquRel> selectByExample(VmProEquRelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_pro_equ_rel
+     *
+     * @mbggenerated
+     */
+    VmProEquRel selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_pro_equ_rel
+     *
+     * @mbggenerated
+     */
+    int updateByExampleSelective(@Param("record") VmProEquRel record, @Param("example") VmProEquRelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_pro_equ_rel
+     *
+     * @mbggenerated
+     */
+    int updateByExample(@Param("record") VmProEquRel record, @Param("example") VmProEquRelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_pro_equ_rel
+     *
+     * @mbggenerated
+     */
+    int updateByPrimaryKeySelective(VmProEquRel record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_pro_equ_rel
+     *
+     * @mbggenerated
+     */
+    int updateByPrimaryKey(VmProEquRel record);
+}

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

@@ -3,7 +3,6 @@ package com.minpay.shouhuo;
 import com.minpay.common.bean.User;
 import com.minpay.common.format.IFormatService;
 import com.minpay.common.service.ILogService;
-import com.minpay.db.table.mapper.VmGameRuleMapper;
 import com.minpay.db.table.mapper.VmOrderInfMapper;
 import com.minpay.db.table.model.VmOrderInf;
 import com.minpay.db.table.own.mapper.OrderManageMapper;
@@ -43,6 +42,9 @@ public class invCardManageAction implements IMINAction {
 	/**  收入统计 **/
 	public final static String SELECT_INCOME_STATISTICS = "selectIncomeStatistics";
 
+	/**  收入统计 **/
+	public final static String SELECT_ALL_INCOME = "selectAllIncome";
+
 	/**  销售数据 **/
 	public final static String SELECT_SALES_DATA = "selectSalesData";
 
@@ -72,6 +74,33 @@ public class invCardManageAction implements IMINAction {
 	}
 
 	/**
+	 * 总收入统计
+	 * @param session
+	 * @return
+	 * @throws Exception
+	 */
+	@MINAction(value = SELECT_ALL_INCOME)
+	public MINActionResult selectAllIncome (
+			MINSession session) throws Exception {
+		MINActionResult res = new MINActionResult();
+		User user = session.getUser();
+		//查询订单数
+		String orderNum = Service.lookup(IMINDataBaseService.class)
+				.getMybatisMapper(OrderManageMapper.class).selectCountOrderNum();
+		//查询累计收入
+		String countIncome = Service.lookup(IMINDataBaseService.class)
+				.getMybatisMapper(OrderManageMapper.class).selectCountIncome();
+		//查询总机台数
+		String countDevice = Service.lookup(IMINDataBaseService.class)
+				.getMybatisMapper(OrderManageMapper.class).selectCountDevice();
+		//返回数据
+		res.set("orderNum", orderNum);
+		res.set("countIncome", countIncome);
+		res.set("countDevice", countDevice);
+		return res;
+	}
+
+	/**
 	 * 收入统计
 	 * @param page
 	 * @param limit
@@ -216,5 +245,4 @@ public class invCardManageAction implements IMINAction {
 		return res;
 	}
 
-
 }

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

@@ -38,6 +38,7 @@
 		and VCI_EXEIT_STATE = "00"
 		and VOI_STATE = "00"
 		and VCI_STATUS = "00"
+		and VOI_PICKUP_STT in ("00", "01")
 	</select>
 	<select id="selectPickupRecord" resultType="hashmap" parameterType="java.util.Map">
 		SELECT
@@ -107,6 +108,34 @@
 		) c
 		ON a.click_date = c.sellTime
 	</select>
+<!--	总订单数-->
+	<select id="selectCountOrderNum" resultType="java.lang.String" parameterType="java.util.Map">
+		SELECT COUNT(1)
+		FROM vm_order_inf
+		WHERE VOI_STATE = '00'
+	</select>
+<!--	累计收入-->
+	<select id="selectCountIncome" resultType="java.lang.String" parameterType="java.util.Map">
+		select sum(PIF_TRXAMOUT)
+		from vm_payment_inf
+		where PIF_STATUS = '1'
+	</select>
+<!--	总机台数-->
+	<select id="selectCountDevice" resultType="java.lang.String" parameterType="java.util.Map">
+		SELECT SUM(PIF_TRXAMOUT)
+		FROM vm_equipment_inf
+		WHERE VEQ_STATE = '00'
+	</select>
+
+	<!--	总实际金额-->
+	<select id="selectCountIncome" resultType="java.lang.String" parameterType="java.util.Map">
+		select sum(PIF_SUCCAMOUNT)
+		from vm_payment_inf
+		where PIF_STATUS = '1'
+	</select>
+
+
+
 
 	<select id="selectProductInfo" resultType="hashmap" parameterType="java.util.Map">
 		SELECT PRT_MASTER_MAP, PRT_NAME, PRT_CATEGORY_ID,

src/main/webapp/admin/incomeStatisticsManage/incomeStatistics.html

@@ -23,9 +23,23 @@
 <script type="text/html" id="barDemo">
 </script>
 <script>
-	layui.use(['table','laydate','form'], function(){
+
+    layui.use(['table','laydate','form'], function(){
 		var laydate = layui.laydate;
-		form = layui.form;
+		$.request({
+			action : '../../invCardManageAction/selectAllIncome',
+			data : { },
+			success : function(data) {
+			    var orderNum = data.orderNum;
+			    var countIncome = data.countIncome;
+			    var countDevice = data.countDevice;
+				$("#orderNum").html(orderNum);
+				$("#countIncome").html(countIncome);
+				$("#countDevice").html(countDevice);
+				form.render();
+			}
+		});
+		form.render();
 	})
 
 	var table;

src/main/webapp/admin/invCardManage/invCardManage.html

@@ -162,7 +162,7 @@
 						action : '../../invCardManageAction/updateOrderStt',
 						data : {
 							orderNo : orderNo, //订单号
-							temp : "0" //操作0：作废，1：取货
+							temp : "1" //操作0：作废，1：取货
 						},
 						success : function(data) {
 							 layer.alert('操作成功!', {