fanli-server.git

			@@ -109,7 +109,7 @@
			* @param out
			*/
			@RequestMapping(value = "countTaoBaoOrder")
			public void countTaoBaoOrder(String callback, HttpServletRequest request, PrintWriter out) {
			public void countTaoBaoOrder(AdminAcceptData acceptData,String callback, HttpServletRequest request, PrintWriter out) {

			try {
			Map<String, Object> countByOdrerType = taoBaoOrderCountService.countByOdrerType();
			@@ -333,7 +333,7 @@
			* @param out
			*/
			@RequestMapping(value = "getHistoryOrder")
			public void getHistoryOrder(String callback, Integer pageIndex, Integer pageSize, Long uid, Integer state,
			public void getHistoryOrder(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, Long uid, Integer state,
			Integer type, Integer orderState, String orderNo, String startTime, String endTime, PrintWriter out) {

			if (uid == null) {
			@@ -400,7 +400,7 @@
			* @param out
			*/
			@RequestMapping(value = "getHistoryUnreceived")
			public void getHistoryUnreceived(String callback, Integer type, PrintWriter out) {
			public void getHistoryUnreceived(AdminAcceptData acceptData,String callback, Integer type, PrintWriter out) {
			try {

			Long total = commonOrderCountService.countByState(1);
			@@ -418,7 +418,7 @@


			@RequestMapping(value = "uploadTaoBaoWeiQuanOrder")
			public void uploadWeiQuanOrder(String callback, HttpServletRequest request, PrintWriter out) {
			public void uploadWeiQuanOrder(AdminAcceptData acceptData,String callback, HttpServletRequest request, PrintWriter out) {
			try {
			// 1. 先判断httpRequest 是否含有文件类型
			if (request instanceof MultipartHttpServletRequest) {
			@@ -438,7 +438,7 @@


			@RequestMapping(value = "countOrderInfo")
			public void countOrderInfo(String callback, Long uid, PrintWriter out) {
			public void countOrderInfo(AdminAcceptData acceptData,String callback, Long uid, PrintWriter out) {
			JSONObject data = new JSONObject();

			/* --------- 本月累计 ------------*/