|
|
@@ -1,5 +1,7 @@
|
|
|
package com.goafanti.order.service.impl;
|
|
|
|
|
|
+import java.util.Calendar;
|
|
|
+import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
@@ -84,6 +86,13 @@ public class OrderBonusServiceImpl extends BaseMybatisDao<TOrderBonusMapper> imp
|
|
|
m1 = Integer.valueOf(newBo.getEndTime().replaceAll("-", ""));
|
|
|
y = Integer.valueOf(newBo.getStartTime().substring(0, newBo.getStartTime().indexOf("-")));
|
|
|
y1 = Integer.valueOf(newBo.getEndTime().substring(0, newBo.getEndTime().indexOf("-")));
|
|
|
+ }else{
|
|
|
+ Calendar cal = Calendar.getInstance();
|
|
|
+ cal.setTime(new Date());
|
|
|
+ y = cal.get(Calendar.YEAR);
|
|
|
+ m = y*100 + (cal.get(Calendar.MONTH)+1);
|
|
|
+ y1 = y;
|
|
|
+ m1 = m;
|
|
|
}
|
|
|
for (TOrderBonusBo orderListBo : list) {
|
|
|
//处理月度数据
|
|
|
@@ -94,8 +103,10 @@ public class OrderBonusServiceImpl extends BaseMybatisDao<TOrderBonusMapper> imp
|
|
|
List<OrderReportBo> l = orderMonthReportMapper.getMonthReportByMonth(r);
|
|
|
if(l.size() == 1){
|
|
|
OrderReportBo o = l.get(0);
|
|
|
- orderListBo.setKejim(o.getKejim());
|
|
|
- orderListBo.setRenzm(o.getRenzm());
|
|
|
+ if(null != o){
|
|
|
+ orderListBo.setKejim(o.getKejim());
|
|
|
+ orderListBo.setRenzm(o.getRenzm());
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
r.setMonth(y);
|
|
|
@@ -104,8 +115,10 @@ public class OrderBonusServiceImpl extends BaseMybatisDao<TOrderBonusMapper> imp
|
|
|
List<OrderReportBo> ll = orderMonthReportMapper.getYearReportByYear(r);
|
|
|
if(l.size() == 1){
|
|
|
OrderReportBo o = ll.get(0);
|
|
|
- orderListBo.setKejiy(o.getKejiy());
|
|
|
- orderListBo.setRenzy(o.getRenzy());
|
|
|
+ if(null != o){
|
|
|
+ orderListBo.setKejiy(o.getKejiy());
|
|
|
+ orderListBo.setRenzy(o.getRenzy());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|