jiazhizhong/crmeb_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

后台数据统计bug修复

Browse Source
This commit is contained in:
张乐
2020-09-17 16:13:54 +08:00
parent b2801f344e
commit c9af25e885
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crmeb/src/main/java/com/zbkj/crmeb/express/service/impl/ShippingTemplatesServiceImpl.java
View File

@@ -97,7 +97,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesD
List<ShippingTemplatesFreeRequest> shippingTemplatesFreeRequestList = request.getShippingTemplatesFreeRequestList(); List<ShippingTemplatesFreeRequest> shippingTemplatesFreeRequestList = request.getShippingTemplatesFreeRequestList();
if(shippingTemplatesFreeRequestList.size() > 0 && request.getAppoint()){ if(null != shippingTemplatesFreeRequestList && shippingTemplatesFreeRequestList.size() > 0 && request.getAppoint()){
shippingTemplatesFreeService.saveAll(shippingTemplatesFreeRequestList, request.getType(), shippingTemplates.getId()); shippingTemplatesFreeService.saveAll(shippingTemplatesFreeRequestList, request.getType(), shippingTemplates.getId());
} }

26
crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreOrderServiceImpl.java
View File

@@ -914,12 +914,11 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderDao, StoreOrder
public StoreOrder getInfoJustOrderInfo(StoreOrder storeOrder) { public StoreOrder getInfoJustOrderInfo(StoreOrder storeOrder) {
LambdaQueryWrapper<StoreOrder> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<StoreOrder> lambdaQueryWrapper = new LambdaQueryWrapper<>();
if(null != storeOrder.getUnique()){ if(null != storeOrder.getUnique()){
lambdaQueryWrapper.or().eq(StoreOrder::getOrderId, storeOrder.getUnique()) lambdaQueryWrapper.eq(StoreOrder::getOrderId, storeOrder.getUnique());
.or().eq(StoreOrder::getUnique,storeOrder.getUnique());
} }
if(null != storeOrder.getUid()){ // if(null != storeOrder.getUid()){
lambdaQueryWrapper.eq(StoreOrder::getUid, storeOrder.getUid()); lambdaQueryWrapper.eq(StoreOrder::getUid, storeOrder.getUid());
} // }
if(null != storeOrder.getIsDel()){ if(null != storeOrder.getIsDel()){
lambdaQueryWrapper.eq(StoreOrder::getIsDel, storeOrder.getIsDel()); lambdaQueryWrapper.eq(StoreOrder::getIsDel, storeOrder.getIsDel());
} }
@@ -1071,16 +1070,17 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderDao, StoreOrder
String dateStartD = dateRange.getStartTime(); String dateStartD = dateRange.getStartTime();
String dateEndD = dateRange.getEndTime(); String dateEndD = dateRange.getEndTime();
int days = DateUtil.daysBetween( int days = DateUtil.daysBetween(
DateUtil.strToDate(dateStartD,Constants.DATE_FORMAT), DateUtil.strToDate(dateStartD,Constants.DATE_FORMAT_DATE),
DateUtil.strToDate(dateEndD,Constants.DATE_FORMAT) DateUtil.strToDate(dateEndD,Constants.DATE_FORMAT_DATE)
); );
// 同时间区间的上一个时间起点 // 同时间区间的上一个时间起点
String perDateStart = DateUtil.addDay(dateStartD, -days, Constants.DATE_FORMAT_START); String perDateStart = DateUtil.addDay(
DateUtil.strToDate(dateStartD,Constants.DATE_FORMAT_DATE), -days, Constants.DATE_FORMAT_START);
// 当前时间区间 // 当前时间区间
String dateStart = DateUtil.dateToStr( String dateStart = DateUtil.addDay(
DateUtil.strToDate(dateStartD,Constants.DATE_FORMAT),Constants.DATE_FORMAT_START); DateUtil.strToDate(dateStartD,Constants.DATE_FORMAT_DATE),0,Constants.DATE_FORMAT_START);
String dateEnd = DateUtil.dateToStr( String dateEnd = DateUtil.addDay(
DateUtil.strToDate(dateEndD,Constants.DATE_FORMAT),Constants.DATE_FORMAT_END); DateUtil.strToDate(dateEndD,Constants.DATE_FORMAT_DATE),0,Constants.DATE_FORMAT_END);
// 上一个时间段查询 // 上一个时间段查询
List<StoreOrder> orderPerList = getOrderPayedByDateLimit(perDateStart,dateStart); List<StoreOrder> orderPerList = getOrderPayedByDateLimit(perDateStart,dateStart);
@@ -1097,7 +1097,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderDao, StoreOrder
// 当前营业额和上一个同比营业额增长区间 // 当前营业额和上一个同比营业额增长区间
increasePrice = currentSumPrice - perSumPrice; increasePrice = currentSumPrice - perSumPrice;
if(increasePrice <= 0) response.setGrowthRate(0); if(increasePrice <= 0) response.setGrowthRate(0);
else if(perSumPrice == 0) response.setGrowthRate((int) increasePrice); else if(perSumPrice == 0) response.setGrowthRate((int) increasePrice * 100);
else response.setGrowthRate((int)((increasePrice * perSumPrice) * 100)); else response.setGrowthRate((int)((increasePrice * perSumPrice) * 100));
}else if(type ==2){ }else if(type ==2){
response.setChart(dao.getOrderStatisticsOrderCountDetail(new StoreDateRangeSqlPram(dateStart,dateEnd))); response.setChart(dao.getOrderStatisticsOrderCountDetail(new StoreDateRangeSqlPram(dateStart,dateEnd)));
@@ -1105,7 +1105,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderDao, StoreOrder
increasePrice = orderCurrentList.size() - orderPerList.size(); increasePrice = orderCurrentList.size() - orderPerList.size();
if(increasePrice <= 0) response.setGrowthRate(0); if(increasePrice <= 0) response.setGrowthRate(0);
else if(orderPerList.size() == 0) response.setGrowthRate((int) increasePrice); else if(orderPerList.size() == 0) response.setGrowthRate((int) increasePrice);
else response.setGrowthRate((int)((increasePrice * orderPerList.size()) * 100)); else response.setGrowthRate((int)((increasePrice / orderPerList.size()) * 100));
} }
response.setIncreaseTime(increasePrice+""); response.setIncreaseTime(increasePrice+"");
response.setIncreaseTimeStatus(increasePrice >= 0 ? 1:2); response.setIncreaseTimeStatus(increasePrice >= 0 ? 1:2);

4
crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreOrderVerificationImpl.java
View File

@@ -115,6 +115,8 @@ public class StoreOrderVerificationImpl implements StoreOrderVerification {
// 获取今日，昨日，本月，订单金额 // 获取今日，昨日，本月，订单金额
String dayStart = DateUtil.nowDateTime(Constants.DATE_FORMAT_START); String dayStart = DateUtil.nowDateTime(Constants.DATE_FORMAT_START);
String dayEnd = DateUtil.nowDateTime(Constants.DATE_FORMAT_END); String dayEnd = DateUtil.nowDateTime(Constants.DATE_FORMAT_END);
String yesterdayStart = DateUtil.addDay(dayStart,-1,Constants.DATE_FORMAT_START);
String yesterdayEnd = DateUtil.addDay(dayEnd,-1,Constants.DATE_FORMAT_END);
String monthStart = DateUtil.nowDateTime(Constants.DATE_FORMAT_MONTH_START); String monthStart = DateUtil.nowDateTime(Constants.DATE_FORMAT_MONTH_START);
String monthEnd = DateUtil.getMonthEndDay(); String monthEnd = DateUtil.getMonthEndDay();
@@ -132,7 +134,7 @@ public class StoreOrderVerificationImpl implements StoreOrderVerification {
// 昨日订单数 // 昨日订单数
LambdaQueryWrapper<StoreOrder> lqwPro = Wrappers.lambdaQuery(); LambdaQueryWrapper<StoreOrder> lqwPro = Wrappers.lambdaQuery();
lqwPro.eq(StoreOrder::getIsDel,false).between(StoreOrder::getPayTime,dayStart,dayEnd) lqwPro.eq(StoreOrder::getIsDel,false).between(StoreOrder::getCreateTime,yesterdayStart,yesterdayEnd)
.eq(StoreOrder::getPaid, true).eq(StoreOrder::getRefundStatus,0); .eq(StoreOrder::getPaid, true).eq(StoreOrder::getRefundStatus,0);
List<StoreOrder> storeOrdersPro = dao.selectList(lqwPro); List<StoreOrder> storeOrdersPro = dao.selectList(lqwPro);
if(null == storeOrdersPro) storeOrdersPro = new ArrayList<>(); if(null == storeOrdersPro) storeOrdersPro = new ArrayList<>();