From 7cf1eb27ecbd23ddc1d0e8080c9637aa6f2a2bf9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 25 六月 2025 08:45:38 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
index bef2d72..66eb669 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
@@ -99,13 +99,9 @@
@Override
public TActivityVO activityStatistics(TActivityStatisticsQuery dto) {
TActivityVO res = new TActivityVO();
-
-
-
PageInfo<TActivityStatisticslVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
- PageInfo<TActivityStatisticslVO> pageInfo1 = new PageInfo<>(1,9999999);
List<TActivityStatisticslVO> list = this.baseMapper.activityStatistics(pageInfo,dto);
- List<TActivityStatisticslVO> list1 = this.baseMapper.activityStatistics(pageInfo1,dto);
+ List<TActivityStatisticslVO> list1 = this.baseMapper.activityStatisticsNolimit(dto);
// 优惠券金额
BigDecimal coupon = new BigDecimal("0");
@@ -179,9 +175,9 @@
tActivityStatisticslVO.setType("赠送会员");
tActivityStatisticslVO.setTime(tActivityStatisticslVO.getCreateTime());
}else{
- // 赠送
- grantVip = grantVip.add(tActivityStatisticslVO.getVipDiscountAmount());
- tActivityStatisticslVO.setType("赠送会员");
+ // 会员活动
+ vipActivity = vipActivity.add(tActivityStatisticslVO.getVipDiscountAmount());
+ tActivityStatisticslVO.setType("会员活动");
tActivityStatisticslVO.setTime(tActivityStatisticslVO.getCreateTime());
}
break;
@@ -457,7 +453,8 @@
shoppingOrderRefundService.save(shoppingOrderRefund);
//手续费
Map<String, Object> amount1 = (Map<String, Object>) orderR.getData().get("amount");
- BigDecimal refund_fee = new BigDecimal(amount1.get("refund_fee").toString()).divide(new BigDecimal(100));
+ Object refund_fee1 = amount1.get("refund_fee");
+ BigDecimal refund_fee = new BigDecimal(null == refund_fee1 ? "0" : refund_fee1.toString()).divide(new BigDecimal(100));
shoppingOrderRefund.setRefundFee(refund_fee);
shoppingOrderRefundService.updateById(shoppingOrderRefund);
}
@@ -488,7 +485,6 @@
* @return
*/
@Override
- @GlobalTransactional(rollbackFor = Exception.class)//分布式事务
public AjaxResult cancelShoppingOrderWxRefund(String out_refund_no, String refund_id, String refund_status, String success_time) {
TShoppingOrderRefund one = shoppingOrderRefundService.getOne(new LambdaQueryWrapper<TShoppingOrderRefund>().eq(TShoppingOrderRefund::getRefundCode, out_refund_no));
one.setRefundStatus(2);
@@ -649,10 +645,10 @@
public List<SixShopDto> sixBefore(LocalDate sixBefore, Integer status) {
return this.baseMapper.sixBefore(sixBefore,status);
}
-
+
@Override
- public BigDecimal getSumAmount(LocalDate sixBefore) {
- return this.baseMapper.getSumAmount(sixBefore);
+ public BigDecimal getSumAmount() {
+ return this.baseMapper.getSumAmount();
}
@Override
--
Gitblit v1.7.1