fanli-server.git

			@@ -9,6 +9,7 @@

			import javax.annotation.Resource;

			import com.yeshi.fanli.entity.accept.AdminAcceptData;
			import org.springframework.stereotype.Controller;
			import org.springframework.web.bind.annotation.RequestMapping;
			import org.yeshi.utils.JsonUtil;
			@@ -24,9 +25,9 @@
			import com.yeshi.fanli.service.inter.count.DailyCountMomentsService;
			import com.yeshi.fanli.service.inter.count.DailyCountOrderService;
			import com.yeshi.fanli.service.inter.count.DailyCountUserService;
			import com.yeshi.fanli.util.MoneyBigDecimalUtil;
			import org.yeshi.utils.MoneyBigDecimalUtil;
			import com.yeshi.fanli.util.StringUtil;
			import com.yeshi.fanli.util.TimeUtil;
			import org.yeshi.utils.TimeUtil;

			import net.sf.json.JSONArray;
			import net.sf.json.JSONObject;
			@@ -61,8 +62,8 @@
			* @param out
			*/
			@RequestMapping(value = "getOrderCharts")
			public void getOrderCharts(String callback, Integer dateType, String year, String startTime, String endTime,
			String typeArray, String channelArray, PrintWriter out) {
			public void getOrderCharts(AdminAcceptData acceptData, String callback, Integer dateType, String year, String startTime, String endTime,
			String typeArray, String channelArray, PrintWriter out) {
			try {
			// 数据验证处理
			verifyQueryData(callback, dateType, year, startTime, endTime, out);
			@@ -195,7 +196,7 @@
			* @param out
			*/
			@RequestMapping(value = "getUserCharts")
			public void getUserCharts(String callback, Integer dateType, String year, String startTime, String endTime,
			public void getUserCharts(AdminAcceptData acceptData,String callback, Integer dateType, String year, String startTime, String endTime,
			String typeArray, String channelArray, PrintWriter out) {
			try {
			// 数据验证处理
			@@ -321,11 +322,10 @@
			* @param year
			* @param startTime
			* @param endTime
			* @param type 查询类型
			* @param out
			*/
			@RequestMapping(value = "getCouponCharts")
			public void getCouponCharts(String callback, Integer dateType, String year, String startTime, String endTime,
			public void getCouponCharts(AdminAcceptData acceptData,String callback, Integer dateType, String year, String startTime, String endTime,
			String typeArray, PrintWriter out) {
			try {
			// 数据验证处理
			@@ -405,7 +405,7 @@


			@RequestMapping(value = "getMomentsCharts")
			public void getMomentsCharts(String callback, Integer dateType, String year, String startTime, String endTime,
			public void getMomentsCharts(AdminAcceptData acceptData,String callback, Integer dateType, String year, String startTime, String endTime,
			String typeArray, PrintWriter out) {
			try {
			// 数据验证处理