msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop

Browse Source
master
kira 6 years ago
parent a2c3128cb0 b3d57f7bd9
commit bd7786e40f
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File

28
src/main/java/au/com/royalpay/payment/manage/actchairty/core/impls/ActChairtyServiceImp.java
Unescape View File

@ -10,12 +10,13 @@ import com.alibaba.fastjson.JSONObject;
import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
import com.github.miemiedev.mybatis.paginator.domain.PageList; import com.github.miemiedev.mybatis.paginator.domain.PageList;
import org.apache.commons.lang3.time.DateFormatUtils; 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 org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
@ -26,7 +27,7 @@ import java.util.List;
*/ */
@Service @Service
public class ActChairtyServiceImp implements ActChairtyService { public class ActChairtyServiceImp implements ActChairtyService {
Logger logger = LoggerFactory.getLogger(getClass());
@Resource @Resource
private ClientManager clientManager; private ClientManager clientManager;
@Resource @Resource
@ -64,18 +65,18 @@ public class ActChairtyServiceImp implements ActChairtyService {
public List<JSONObject> getWeekendAnalysis(JSONObject params) { public List<JSONObject> getWeekendAnalysis(JSONObject params) {
List<JSONObject> result = new ArrayList<>(); List<JSONObject> result = new ArrayList<>();
List<JSONObject> getAnalysis = actChairtyMapper.getChairtyWeekAnalysis(params.getDate("begin"), params.getDate("end")); List<JSONObject> getAnalysis = actChairtyMapper.getChairtyWeekAnalysis(params.getDate("begin"), params.getDate("end"));
SimpleDateFormat df=new SimpleDateFormat("yyyy-MM-dd"); DateFormatUtils df = new DateFormatUtils();
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
cal.setTime(params.getDate("begin")); cal.setTime(params.getDate("begin"));
cal.add(cal.DAY_OF_MONTH, -1); cal.add(cal.DAY_OF_MONTH, -1);
long beginTime = params.getDate("begin").getTime(); long beginTime = params.getDate("begin").getTime();
long endTime = params.getDate("end").getTime(); long endTime = params.getDate("end").getTime();
long betweenDays = (long)((endTime - beginTime) / (1000 * 60 * 60 *24)); long betweenDays = (long)((endTime - beginTime) / (1000 * 60 * 60 *24));
List<String> weekStart = new ArrayList<String>(); List<String> weekStart = new ArrayList<>();
for(int i=0;i<=betweenDays;i++){ for(int i=0;i<=betweenDays;i++){
cal.add(cal.DAY_OF_MONTH, 1);//DATE=日 cal.add(cal.DAY_OF_MONTH, 1);//DATE=日
if ((cal.get(Calendar.DAY_OF_WEEK)) == 2) { 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<weekStart.size();i++){ for(int i=0;i<weekStart.size();i++){
@ -83,13 +84,9 @@ public class ActChairtyServiceImp implements ActChairtyService {
BigDecimal count_ordernum = new BigDecimal(0); BigDecimal count_ordernum = new BigDecimal(0);
BigDecimal sum_ordernum = new BigDecimal(0); BigDecimal sum_ordernum = new BigDecimal(0);
String weekS = weekStart.get(i); String weekS = weekStart.get(i);
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
try { try {
Date dateStar = dateFormat.parse(weekS); Date dateStar = DateUtils.parseDate(weekS,"yyyy-MM-dd");
Calendar d1 = Calendar.getInstance(); Date dateEnd = DateUtils.addDays(dateStar, 7);
d1.setTime(dateStar);
d1.add(Calendar.DAY_OF_YEAR,7);
Date dateEnd = d1.getTime();
for (int b = 0; b < getAnalysis.size(); b++) { for (int b = 0; b < getAnalysis.size(); b++) {
long orderDate = getAnalysis.get(b).getDate("orderdate").getTime(); long orderDate = getAnalysis.get(b).getDate("orderdate").getTime();
if (orderDate >= dateStar.getTime() && orderDate < dateEnd.getTime()) { if (orderDate >= dateStar.getTime() && orderDate < dateEnd.getTime()) {
@ -99,16 +96,15 @@ public class ActChairtyServiceImp implements ActChairtyService {
} }
BigDecimal chairty = new BigDecimal(0.01); BigDecimal chairty = new BigDecimal(0.01);
BigDecimal chairty_amount = count_ordernum.multiply(chairty); BigDecimal chairty_amount = count_ordernum.multiply(chairty);
double f1 = sum_ordernum.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); BigDecimal f1 = sum_ordernum.setScale(2, BigDecimal.ROUND_HALF_UP);
double f2 = chairty_amount.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); BigDecimal f2 = chairty_amount.setScale(2, BigDecimal.ROUND_HALF_UP);
weekDay.put("weekstart", weekStart.get(i)); weekDay.put("weekstart", weekStart.get(i));
weekDay.put("count_ordernum", count_ordernum); weekDay.put("count_ordernum", count_ordernum);
weekDay.put("sum_ordernum", f1); weekDay.put("sum_ordernum", f1);
weekDay.put("chairty_amount",f2 ); weekDay.put("chairty_amount",f2 );
result.add(weekDay); result.add(weekDay);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); logger.info("Act_Chairty Error:",e);
} }
} }

Write Preview
Loading…
Cancel
Save