From 0c9874c42bfa88f9b86112a3dbf9cf77f4393880 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期六, 26 十一月 2022 16:23:49 +0800
Subject: [PATCH] #feat 商家浏览量计算
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java | 102 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 80 insertions(+), 22 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java
index 5440123..33527b5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java
@@ -40,7 +40,6 @@
*/
@Slf4j
@Service
-@Transactional(rollbackFor = Exception.class)
public class ComShopFlowerOrderServiceImpl extends ServiceImpl<ComShopFlowerOrderDAO, ComShopFlowerOrderDO>
implements ComShopFlowerOrderService {
@@ -68,6 +67,8 @@
private ComShopFlowerEvaluateDAO comShopFlowerEvaluateDAO;
@Resource
private ComShopFlowerRefundOrderDAO comShopFlowerRefundOrderDAO;
+ @Resource
+ private ComShopFlowerOrderDeliveryDAO comShopFlowerOrderDeliveryDAO;
@Value("${hcMin.app.isTest}")
@@ -536,6 +537,7 @@
} catch (Exception e) {
log.error("申请退款失败，" + e.getMessage());
e.printStackTrace();
+ return R.fail("取消订单失败");
}
if (this.baseMapper.updateById(shopOrderDO) > 0) {
// 添加订单操作记录
@@ -565,6 +567,7 @@
* @return 删除结果
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public R orderDelete(Long orderId) {
// 查询订单
ComShopFlowerOrderDO shopOrderDO = this.baseMapper.selectById(orderId);
@@ -870,6 +873,8 @@
* @param orderPayDTO 请求参数
* @return 支付对象
*/
+ @Override
+ @Transactional(rollbackFor = Exception.class)
public R wxPay(OrderPayDTO orderPayDTO) {
// 创建返回参数
ComShopFlowerOrderVO shopOrderVO = new ComShopFlowerOrderVO();
@@ -900,11 +905,8 @@
@Override
public R pageOrderByStoreId(PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
-
Page page = new Page(pageComFlowerOrderListDTO.getPageNum(), pageComFlowerOrderListDTO.getPageSize());
-
IPage<ComShopFlowerOrderStoreListVO> orderPageVOIPage = this.baseMapper.pageOrderByStoreId(page, pageComFlowerOrderListDTO);
-
if (!orderPageVOIPage.getRecords().isEmpty()) {
orderPageVOIPage.getRecords().forEach(orderVo -> {
if (null!=orderVo.getPointId()){
@@ -1009,27 +1011,52 @@
return R.ok(retMap);
}
- public R selectOrderLineChart(Long storeId, Integer type) {
- if (1 == type) {
- //近15天的订单量
- int days = 15;
- return getCountByStoreIdAndDays(storeId, days);
- } else if (2 == type) {
- //近30天的订单量
- int days = 30;
- return getCountByStoreIdAndDays(storeId, days);
- } else {
- //今年所有月份订单量
- List<ComShopOrderStoreIdCountVO> comShopOrderStoreIdCountVOS = this.baseMapper.selectCountOrderMonthByStoreId(storeId);
- Map<String, Integer> retMap = comShopOrderStoreIdCountVOS.stream().collect(Collectors.toMap(ComShopOrderStoreIdCountVO::getCountName, ComShopOrderStoreIdCountVO::getCountNum));
- List<String> yearMonths = DateUtils.getYearMonths();
- for (String yearMonth : yearMonths) {
- if (!retMap.containsKey(yearMonth)) {
- retMap.put(yearMonth, 0);
+ public R selectOrderLineChart(Long storeId, Integer type,Integer tab) {
+ if (tab == 1){
+ if (1 == type) {
+ //近15天的订单量
+ int days = 15;
+ return getCountByStoreIdAndDays(storeId, days);
+ } else if (2 == type) {
+ //近30天的订单量
+ int days = 30;
+ return getCountByStoreIdAndDays(storeId, days);
+ } else {
+ //今年所有月份订单量
+ List<ComShopOrderStoreIdCountVO> comShopOrderStoreIdCountVOS = this.baseMapper.selectCountOrderMonthByStoreId(storeId);
+ Map<String, Integer> retMap = comShopOrderStoreIdCountVOS.stream().collect(Collectors.toMap(ComShopOrderStoreIdCountVO::getCountName, ComShopOrderStoreIdCountVO::getCountNum));
+ List<String> yearMonths = DateUtils.getYearMonths();
+ for (String yearMonth : yearMonths) {
+ if (!retMap.containsKey(yearMonth)) {
+ retMap.put(yearMonth, 0);
+ }
}
+ return R.ok(retMap);
}
- return R.ok(retMap);
+ }else if (2==tab){
+ if (1 == type) {
+ //近15天的营收
+ int days = 15;
+ return getSumByStoreIdAndDays(storeId, days);
+ } else if (2 == type) {
+ //近30天的营收
+ int days = 30;
+ return getSumByStoreIdAndDays(storeId, days);
+ } else {
+ //今年所有月份订单量
+ List<ComShopOrderStoreIdNumVO> comShopOrderStoreIdCountVOS = this.baseMapper.selectOrderSumMonthByStoreId(storeId);
+ Map<String, BigDecimal> retMap = comShopOrderStoreIdCountVOS.stream().collect(Collectors.toMap(ComShopOrderStoreIdNumVO::getCountName, ComShopOrderStoreIdNumVO::getCountNum));
+ List<String> yearMonths = DateUtils.getYearMonths();
+ for (String yearMonth : yearMonths) {
+ if (!retMap.containsKey(yearMonth)) {
+ retMap.put(yearMonth, BigDecimal.ZERO);
+ }
+ }
+ return R.ok(retMap);
+ }
}
+ return R.ok();
+
}
private R getCountByStoreIdAndDays(Long storeId, int days) {
@@ -1043,4 +1070,35 @@
}
return R.ok(retMap);
}
+
+ private R getSumByStoreIdAndDays(Long storeId, int days) {
+ List<ComShopOrderStoreIdNumVO> comShopOrderStoreIdNumVOS = this.baseMapper.selectOrderSumPayDayByStoreId(storeId, days);
+ Map<String, BigDecimal> retMap = comShopOrderStoreIdNumVOS.stream().collect(Collectors.toMap(ComShopOrderStoreIdNumVO::getCountName, ComShopOrderStoreIdNumVO::getCountNum));
+ List<String> beforeDays = DateUtils.getBeforeDays(days);
+ for (String beforeDay : beforeDays) {
+ if (!retMap.containsKey(beforeDay)) {
+ retMap.put(beforeDay, BigDecimal.ZERO);
+ }
+ }
+ return R.ok(retMap);
+ }
+
+ @Override
+ public R pageOrderByDeliveryNo(PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
+ Page page = new Page(pageComFlowerOrderListDTO.getPageNum(), pageComFlowerOrderListDTO.getPageSize());
+ IPage<ComShopFlowerOrderStoreListVO> orderPageVOIPage = this.baseMapper.pageOrderByDeliveryNo(page, pageComFlowerOrderListDTO);
+ ComShopFlowerOrderDeliveryNoListVO comShopFlowerOrderDeliveryNoListVO = new ComShopFlowerOrderDeliveryNoListVO();
+ ComShopFlowerOrderDeliveryDO comShopFlowerOrderDeliveryDO = comShopFlowerOrderDeliveryDAO.selectById(pageComFlowerOrderListDTO.getDeliveryId());
+ ComShopFlowerOrderDeliveryVO comShopFlowerOrderDeliveryVO = new ComShopFlowerOrderDeliveryVO();
+ BeanUtils.copyProperties(comShopFlowerOrderDeliveryDO,comShopFlowerOrderDeliveryVO);
+
+ Long pointId = comShopFlowerOrderDeliveryDO.getPointId();
+ ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectById(pointId);
+ ConvenientElevatingPointVO convenientElevatingPointVO = new ConvenientElevatingPointVO();
+ BeanUtils.copyProperties(convenientElevatingPointDO,convenientElevatingPointVO);
+ comShopFlowerOrderDeliveryVO.setConvenientElevatingPointVO(convenientElevatingPointVO);
+ comShopFlowerOrderDeliveryNoListVO.setComShopFlowerOrderDeliveryVO(comShopFlowerOrderDeliveryVO);
+ comShopFlowerOrderDeliveryNoListVO.setPage(orderPageVOIPage);
+ return R.ok(comShopFlowerOrderDeliveryNoListVO);
+ }
}
--
Gitblit v1.7.1