|
|
@ -5,6 +5,7 @@ import cn.chjyj.szwh.mapper.GoodsMapper; |
|
|
import cn.chjyj.szwh.mapper.OrderGoodsDetailMapper; |
|
|
import cn.chjyj.szwh.mapper.OrderGoodsDetailMapper; |
|
|
import cn.chjyj.szwh.mapper.OrderMapper; |
|
|
import cn.chjyj.szwh.mapper.OrderMapper; |
|
|
import cn.chjyj.szwh.service.IndexService; |
|
|
import cn.chjyj.szwh.service.IndexService; |
|
|
|
|
|
import cn.chjyj.szwh.utils.DateUtils; |
|
|
import cn.chjyj.szwh.utils.SzwhApiUtils; |
|
|
import cn.chjyj.szwh.utils.SzwhApiUtils; |
|
|
import cn.chjyj.szwh.vo.GoodsDetailVo; |
|
|
import cn.chjyj.szwh.vo.GoodsDetailVo; |
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
@ -185,13 +186,14 @@ public class IndexServiceImpl implements IndexService { |
|
|
ncal.getTime(); |
|
|
ncal.getTime(); |
|
|
// 日历中取到今年的年份
|
|
|
// 日历中取到今年的年份
|
|
|
int year = ncal.get(Calendar.YEAR); |
|
|
int year = ncal.get(Calendar.YEAR); |
|
|
|
|
|
// 日历中取到本月月份
|
|
|
|
|
|
int month= ncal.get(Calendar.MONTH); |
|
|
// 订单金额总数
|
|
|
// 订单金额总数
|
|
|
List ftlist = new ArrayList(); |
|
|
List ftlist = new ArrayList(); |
|
|
//标的金额
|
|
|
//标的金额
|
|
|
List bdlist = new ArrayList(); |
|
|
List bdlist = new ArrayList(); |
|
|
|
|
|
|
|
|
if ("year".equals(leftDate)) { //年
|
|
|
if ("year".equals(leftDate)) { //年
|
|
|
|
|
|
|
|
|
// 数组索引从0 开始
|
|
|
// 数组索引从0 开始
|
|
|
for (int i = 4; i >= 0; i--) { |
|
|
for (int i = 4; i >= 0; i--) { |
|
|
int nyear = year - i; |
|
|
int nyear = year - i; |
|
|
@ -218,7 +220,19 @@ public class IndexServiceImpl implements IndexService { |
|
|
bdlist.add(rest[1]); |
|
|
bdlist.add(rest[1]); |
|
|
} |
|
|
} |
|
|
}else{ |
|
|
}else{ |
|
|
//
|
|
|
// 计算本月的天数,系统日期从0 开始,需要加上1
|
|
|
|
|
|
int monthHasDays= DateUtils.getDaysOfMonth(new Date()); |
|
|
|
|
|
for(int i=0;i<=monthHasDays;i++){ |
|
|
|
|
|
labelList.add((i+1) + "日"); |
|
|
|
|
|
// 组装时间
|
|
|
|
|
|
String startdt = year +"-"+month+"-"+i+ " 00:00:00"; |
|
|
|
|
|
String enddt = year +"-"+month+"-"+i+ " 23:59:59"; |
|
|
|
|
|
BigDecimal[] rest = getDateMomeny(startdt, enddt); |
|
|
|
|
|
// 订单金额
|
|
|
|
|
|
ftlist.add(rest[0]); |
|
|
|
|
|
// 标的
|
|
|
|
|
|
bdlist.add(rest[1]); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// 订单
|
|
|
// 订单
|
|
|
|