other_project/mallplus
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

订单数据统计以及订单归集数量统计

Browse Source
This commit is contained in:
dimengzhe
2023-03-25 16:22:23 +08:00
parent f302bb372e
commit ad35f9db7d
3 changed files with 92 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java
View File

@@ -65,18 +65,17 @@ public class OmsOrderController {
) {
try {
QueryWrapper<OmsOrder> qw = new QueryWrapper<>();
if(StringUtils.isNotBlank(omsOrderQuery.getOrderSn())){
qw.like("order_sn",omsOrderQuery.getOrderSn());
if (StringUtils.isNotBlank(omsOrderQuery.getOrderSn())) {
qw.like("order_sn", omsOrderQuery.getOrderSn());
}
if(StringUtils.isNotBlank(omsOrderQuery.getReceiverPhone())){
qw.like("receiver_phone",omsOrderQuery.getReceiverPhone());
if (StringUtils.isNotBlank(omsOrderQuery.getReceiverPhone())) {
qw.like("receiver_phone", omsOrderQuery.getReceiverPhone());
}
qw.apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeStart()), "date_format (create_time,'%Y-%m-%d') >= date_format('" + omsOrderQuery.getCreateTimeStart() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeEnd()), "date_format (create_time,'%Y-%m-%d') <= date_format('" + omsOrderQuery.getCreateTimeEnd() + "','%Y-%m-%d')"
);
if(StringUtils.isNotBlank(omsOrderQuery.getStatus())){
qw.eq("status",omsOrderQuery.getStatus());
if (StringUtils.isNotBlank(omsOrderQuery.getStatus())) {
qw.eq("status", omsOrderQuery.getStatus());
}
return new CommonResult().success(IOmsOrderService.page(new Page<OmsOrder>(pageNum, pageSize), qw.orderByDesc("create_time").select(ConstansValue.sampleOrderList)));
@@ -236,18 +235,30 @@ public class OmsOrderController {
}
return new CommonResult().success(page);
}
/**@Valid
* 根据商品分类统计订单占比
/**
* @Valid 根据商品分类统计订单占比
*/
@GetMapping("/orderCount")
public Object orderCount(){
OrderCountDto orderCountDto = IOmsOrderService.getOrderCount();
public Object orderCount() {
OrderCountDto orderCountDto = IOmsOrderService.getOrderCount();
return new CommonResult().success(orderCountDto);
}
@GetMapping(value = "/data/count")
public Object getCount(@RequestParam("status") Integer status) {
return new CommonResult().success(IOmsOrderService.getOrderTimeData(status));
public Object getCount(OmsOrderQuery omsOrderQuery) {
return new CommonResult().success(IOmsOrderService.getOrderTimeData(omsOrderQuery));
}
/**
* 订单归集数量
*
* @param omsOrderLocationQuery
* @return
*/
@GetMapping(value = "/data/count2")
public Object getCount(OmsOrderLocationQuery omsOrderLocationQuery) {
return new CommonResult().success(IOmsOrderService.getOrderTimeData2(omsOrderLocationQuery));
}
@GetMapping(value = "/data/chart")
@@ -275,17 +286,17 @@ public class OmsOrderController {
) {
try {
QueryWrapper<OmsOrder> qw = new QueryWrapper<>();
if(StringUtils.isNotBlank(omsOrderLocationQuery.getValueqhd())){
qw.eq("receiver_detail_address",omsOrderLocationQuery.getValueqhd());
if (StringUtils.isNotBlank(omsOrderLocationQuery.getValueqhd())) {
qw.eq("receiver_detail_address", omsOrderLocationQuery.getValueqhd());
}
if(StringUtils.isNotBlank(omsOrderLocationQuery.getValueszd())){
qw.eq("receiver_region",omsOrderLocationQuery.getValueszd());
if (StringUtils.isNotBlank(omsOrderLocationQuery.getValueszd())) {
qw.eq("receiver_region", omsOrderLocationQuery.getValueszd());
}
if(StringUtils.isNotBlank(omsOrderLocationQuery.getReceiverPhone())){
qw.like("receiver_phone",omsOrderLocationQuery.getReceiverPhone());
if (StringUtils.isNotBlank(omsOrderLocationQuery.getReceiverPhone())) {
qw.like("receiver_phone", omsOrderLocationQuery.getReceiverPhone());
}
if(StringUtils.isNotBlank(omsOrderLocationQuery.getStatus())){
qw.eq("status",omsOrderLocationQuery.getStatus());
if (StringUtils.isNotBlank(omsOrderLocationQuery.getStatus())) {
qw.eq("status", omsOrderLocationQuery.getStatus());
}
IPage<OmsOrder> page = IOmsOrderService.page(new Page<OmsOrder>(pageNum, pageSize), qw.orderByDesc("create_time").select(ConstansValue.sampleOrderList));

5
mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/IOmsOrderService.java
View File

@@ -3,6 +3,8 @@ package com.zscat.mallplus.oms.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zscat.mallplus.oms.entity.OmsOrder;
import com.zscat.mallplus.oms.entity.OmsOrderLocation;
import com.zscat.mallplus.oms.query.OmsOrderLocationQuery;
import com.zscat.mallplus.oms.query.OmsOrderQuery;
import com.zscat.mallplus.oms.vo.*;
import org.springframework.transaction.annotation.Transactional;
@@ -69,7 +71,8 @@ public interface IOmsOrderService extends IService<OmsOrder> {
*/
OrderCountDto getOrderCount();
Object getOrderTimeData(Integer status);
Object getOrderTimeData(OmsOrderQuery omsOrderQuery);
Object getOrderTimeData2(OmsOrderLocationQuery omsOrderLocationQuery);
Object chartCount();

62
mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java
View File

@@ -9,6 +9,8 @@ import com.zscat.mallplus.oms.entity.OmsOrderLocation;
import com.zscat.mallplus.oms.entity.OmsOrderOperateHistory;
import com.zscat.mallplus.oms.mapper.OmsOrderMapper;
import com.zscat.mallplus.oms.mapper.OmsOrderOperateHistoryMapper;
import com.zscat.mallplus.oms.query.OmsOrderLocationQuery;
import com.zscat.mallplus.oms.query.OmsOrderQuery;
import com.zscat.mallplus.oms.service.IOmsOrderOperateHistoryService;
import com.zscat.mallplus.oms.service.IOmsOrderService;
import com.zscat.mallplus.oms.vo.*;
@@ -18,6 +20,7 @@ import com.zscat.mallplus.ums.entity.SysMessage;
import com.zscat.mallplus.ums.entity.UmsMember;
import com.zscat.mallplus.ums.mapper.UmsMemberMapper;
import com.zscat.mallplus.ums.service.ISysMessageService;
import com.zscat.mallplus.util.StringUtils;
import com.zscat.mallplus.utils.ValidatorUtils;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;
@@ -183,14 +186,62 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
}
@Override
public Object getOrderTimeData(Integer status) {
BigDecimal nowOrderPay = new BigDecimal(0); //销售总额
public Object getOrderTimeData(OmsOrderQuery omsOrderQuery) {
QueryWrapper<OmsOrder> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(omsOrderQuery.getOrderSn())) {
qw.like("order_sn", omsOrderQuery.getOrderSn());
}
if (StringUtils.isNotBlank(omsOrderQuery.getReceiverPhone())) {
qw.like("receiver_phone", omsOrderQuery.getReceiverPhone());
}
qw.apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeStart()), "date_format (create_time,'%Y-%m-%d') >= date_format('" + omsOrderQuery.getCreateTimeStart() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeEnd()), "date_format (create_time,'%Y-%m-%d') <= date_format('" + omsOrderQuery.getCreateTimeEnd() + "','%Y-%m-%d')"
);
//销售总额
BigDecimal nowOrderPay = new BigDecimal(0);
List<OmsOrder> orders = null;
Map<Long, Object> memberMap = new HashMap<>();
if (status == 0) {
orders = orderMapper.selectList(new QueryWrapper<OmsOrder>());
if (StringUtils.isBlank(omsOrderQuery.getStatus())) {
//查询全部订单
orders = orderMapper.selectList(qw);
} else {
orders = orderMapper.selectList(new QueryWrapper<OmsOrder>().eq("status", status));
orders = orderMapper.selectList(qw.eq("status",omsOrderQuery.getStatus()));
}
for (OmsOrder order : orders) {
memberMap.put(order.getMemberId(), order.getId());
nowOrderPay = nowOrderPay.add(order.getPayAmount());
}
Map<String, Object> map = new HashMap();
map.put("orderCount", orders.size());
map.put("orderPay", nowOrderPay);
map.put("memberCount", memberMap.size());
return map;
}
@Override
public Object getOrderTimeData2(OmsOrderLocationQuery omsOrderLocationQuery) {
QueryWrapper<OmsOrder> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(omsOrderLocationQuery.getValueqhd())) {
qw.eq("receiver_detail_address", omsOrderLocationQuery.getValueqhd());
}
if (StringUtils.isNotBlank(omsOrderLocationQuery.getValueszd())) {
qw.eq("receiver_region", omsOrderLocationQuery.getValueszd());
}
if (StringUtils.isNotBlank(omsOrderLocationQuery.getReceiverPhone())) {
qw.like("receiver_phone", omsOrderLocationQuery.getReceiverPhone());
}
if (StringUtils.isNotBlank(omsOrderLocationQuery.getStatus())) {
qw.eq("status", omsOrderLocationQuery.getStatus());
}
//销售总额
BigDecimal nowOrderPay = new BigDecimal(0);
List<OmsOrder> orders = null;
Map<Long, Object> memberMap = new HashMap<>();
if (StringUtils.isBlank(omsOrderLocationQuery.getStatus())) {
//查询全部订单
orders = orderMapper.selectList(qw);
} else {
orders = orderMapper.selectList(qw.eq("status",omsOrderLocationQuery.getStatus()));
}
for (OmsOrder order : orders) {
memberMap.put(order.getMemberId(), order.getId());
@@ -200,7 +251,6 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
map.put("orderCount", orders.size());
map.put("orderPay", nowOrderPay);
map.put("memberCount", memberMap.size());
// map.put("femallount", femallount);
return map;
}