diff --git a/src/main/java/au/com/royalpay/payment/manage/actchairty/core/impls/ActChairtyServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/actchairty/core/impls/ActChairtyServiceImp.java index b7d86ffbf..30c3c928f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/actchairty/core/impls/ActChairtyServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/actchairty/core/impls/ActChairtyServiceImp.java @@ -10,12 +10,13 @@ import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; import org.apache.commons.lang3.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; -import java.text.DateFormat; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; @@ -26,7 +27,7 @@ import java.util.List; */ @Service public class ActChairtyServiceImp implements ActChairtyService { - + Logger logger = LoggerFactory.getLogger(getClass()); @Resource private ClientManager clientManager; @Resource @@ -64,18 +65,18 @@ public class ActChairtyServiceImp implements ActChairtyService { public List getWeekendAnalysis(JSONObject params) { List result = new ArrayList<>(); List getAnalysis = actChairtyMapper.getChairtyWeekAnalysis(params.getDate("begin"), params.getDate("end")); - SimpleDateFormat df=new SimpleDateFormat("yyyy-MM-dd"); + DateFormatUtils df = new DateFormatUtils(); Calendar cal = Calendar.getInstance(); cal.setTime(params.getDate("begin")); cal.add(cal.DAY_OF_MONTH, -1); long beginTime = params.getDate("begin").getTime(); long endTime = params.getDate("end").getTime(); long betweenDays = (long)((endTime - beginTime) / (1000 * 60 * 60 *24)); - List weekStart = new ArrayList(); + List weekStart = new ArrayList<>(); for(int i=0;i<=betweenDays;i++){ cal.add(cal.DAY_OF_MONTH, 1);//DATE=日 if ((cal.get(Calendar.DAY_OF_WEEK)) == 2) { - weekStart.add(df.format(cal.getTime())); + weekStart.add(df.format(cal.getTime(),"yyyy-MM-dd")); } } for(int i=0;i= dateStar.getTime() && orderDate < dateEnd.getTime()) { @@ -99,16 +96,15 @@ public class ActChairtyServiceImp implements ActChairtyService { } BigDecimal chairty = new BigDecimal(0.01); BigDecimal chairty_amount = count_ordernum.multiply(chairty); - double f1 = sum_ordernum.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); - double f2 = chairty_amount.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); - + BigDecimal f1 = sum_ordernum.setScale(2, BigDecimal.ROUND_HALF_UP); + BigDecimal f2 = chairty_amount.setScale(2, BigDecimal.ROUND_HALF_UP); weekDay.put("weekstart", weekStart.get(i)); weekDay.put("count_ordernum", count_ordernum); weekDay.put("sum_ordernum", f1); weekDay.put("chairty_amount",f2 ); result.add(weekDay); } catch (Exception e) { - e.printStackTrace(); + logger.info("Act_Chairty Error:",e); } }