|
@@ -159,17 +159,19 @@ public class JiaoYangReportController extends BaseController {
|
|
|
|
|
|
@GetMapping("/profitData")
|
|
|
@ApiOperation(value = "商品列表")
|
|
|
- public JSONObject profitData(String date, Integer dataType) throws ParseException {
|
|
|
+ public JSONObject profitData(String startDate, String endDate, Integer dataType) throws ParseException {
|
|
|
|
|
|
JSONObject returnJson = new JSONObject();
|
|
|
|
|
|
try {
|
|
|
- String lastDate = DateUtils.getAnotherDay("yyyy-MM-dd", date, -1); // 日期 -1
|
|
|
- String firstDateByMonth = DateUtils.getMonthStartDay(date); // 本月第一天
|
|
|
- // date 为本月结束时间
|
|
|
- String lastMonthFirstDate = DateUtils.getLastMonthFirstDayByDate(date);// 上个月开始时间
|
|
|
- String lastMonthEndDate = DateUtils.getLastMonthNowDay(date);// 上个月结束时间
|
|
|
- JSONObject dayData = jiaoYangReportService.dayData(DateUtils.strDateTimsToInt(date), DateUtils.strDateTimsToInt(lastDate), dataType);
|
|
|
+
|
|
|
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ int differDay = DateUtils.differentDaysByMillisecond(simpleDateFormat.parse(startDate), simpleDateFormat.parse(endDate));
|
|
|
+ String lastEnd = DateUtils.getAnotherDay("yyyy-MM-dd", startDate, -1); // 上一时段结束日期
|
|
|
+ String lastStart = DateUtils.getAnotherDay("yyyy-MM-dd", lastEnd, -differDay); // 上一时段开始日期
|
|
|
+
|
|
|
+
|
|
|
+ JSONObject dayData = jiaoYangReportService.dayData(DateUtils.strDateTimsToInt(startDate), DateUtils.strDateTimsToInt(endDate), DateUtils.strDateTimsToInt(lastStart), DateUtils.strDateTimsToInt(lastEnd), dataType);
|
|
|
JSONArray dayArray = new JSONArray();
|
|
|
JSONObject obj1 = new JSONObject();
|
|
|
obj1.put("date", dayData.getString("date"));
|
|
@@ -204,7 +206,13 @@ public class JiaoYangReportController extends BaseController {
|
|
|
dayArray.add(obj3);
|
|
|
dayArray.add(new JSONObject());
|
|
|
|
|
|
- JSONObject monthData = jiaoYangReportService.monthData(DateUtils.strDateTimsToInt(firstDateByMonth), DateUtils.strDateTimsToInt(date), DateUtils.strDateTimsToInt(lastMonthFirstDate), DateUtils.strDateTimsToInt(lastMonthEndDate), dataType);
|
|
|
+
|
|
|
+ String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
|
|
|
+ String yesDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1); // 日期 -1
|
|
|
+ String lastMonthFirstDate = DateUtils.getLastMonthFirstDayByDate(yesDate);// 上个月开始时间
|
|
|
+ String lastMonthEndDate = DateUtils.getLastMonthNowDay(yesDate);// 上个月结束时间
|
|
|
+ String firstDateByMonth = DateUtils.getMonthStartDay(yesDate); // 本月第一天
|
|
|
+ JSONObject monthData = jiaoYangReportService.monthData(DateUtils.strDateTimsToInt(firstDateByMonth), DateUtils.strDateTimsToInt(yesDate), DateUtils.strDateTimsToInt(lastMonthFirstDate), DateUtils.strDateTimsToInt(lastMonthEndDate), dataType);
|
|
|
|
|
|
|
|
|
JSONObject obj4 = new JSONObject();
|