From 082b9ab8643bc5e81f2e70b8e9400fdaba62e686 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 03 九月 2025 17:19:18 +0800
Subject: [PATCH] 修改小程序首页查询重复bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java | 132 +++++++++++++++++++++----------------------
1 files changed, 64 insertions(+), 68 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 4783fdf..a33ba2a 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
@@ -1,5 +1,6 @@
package com.ruoyi.order.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -13,19 +14,16 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.order.api.model.TExchangeOrder;
import com.ruoyi.order.api.model.TShoppingOrder;
import com.ruoyi.order.api.model.TShoppingOrderRefund;
import com.ruoyi.order.api.query.ShoppingOrderQuery;
import com.ruoyi.order.api.query.TActivityStatisticsQuery;
-import com.ruoyi.order.api.vo.ChargingOrderVO;
import com.ruoyi.order.api.vo.TActivityStatisticslVO;
import com.ruoyi.order.api.vo.TActivityVO;
import com.ruoyi.order.dto.*;
import com.ruoyi.order.mapper.TShoppingOrderMapper;
import com.ruoyi.order.service.TShoppingOrderRefundService;
import com.ruoyi.order.service.TShoppingOrderService;
-import com.ruoyi.order.util.RedisLock;
import com.ruoyi.other.api.domain.TCoupon;
import com.ruoyi.other.api.domain.TGoods;
import com.ruoyi.other.api.feignClient.CouponClient;
@@ -37,7 +35,8 @@
import com.ruoyi.payment.api.model.WxPaymentRefundModel;
import com.ruoyi.payment.api.vo.AliQueryOrder;
import com.ruoyi.payment.api.vo.NotifyV3PayDecodeRespBody;
-import io.seata.spring.annotation.GlobalTransactional;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@@ -51,6 +50,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -63,50 +63,48 @@
*/
@Service
public class TShoppingOrderServiceImpl extends ServiceImpl<TShoppingOrderMapper, TShoppingOrder> implements TShoppingOrderService {
-
+
@Resource
private TokenService tokenService;
-
+
@Resource
private GoodsClient goodsClient;
-
+
@Resource
private CouponClient couponClient;
@Resource
private AppUserClient appUserClient;
-
+
@Resource
private AppUserAddressClient appUserAddressClient;
@Resource
private AppCouponClient appCouponClient;
-
+
@Resource
private WxPaymentClient wxPaymentClient;
-
+
@Resource
private AliPaymentClient aliPaymentClient;
-
+
@Resource
private TShoppingOrderRefundService shoppingOrderRefundService;
-
+
@Autowired
public RedisTemplate redisTemplate;
-
-
-
+
+ @Autowired
+ private RedissonClient redissonClient;
+
+
+
@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);
- list.sort((o1, o2) -> o2.getCreateTime().compareTo(o1.getCreateTime()));
// 优惠券金额
BigDecimal coupon = new BigDecimal("0");
// 会员抵扣金额
@@ -115,7 +113,6 @@
BigDecimal vipActivity = new BigDecimal("0");
// 赠送会员
BigDecimal grantVip = new BigDecimal("0");
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
for (TActivityStatisticslVO tActivityStatisticslVO : list1) {
TAppUser data = appUserClient.getUserById(tActivityStatisticslVO.getAppUserId()).getData();
if (data!=null){
@@ -167,9 +164,7 @@
break;
case 3:
// 会员订单 优惠金额大于0
- if (tActivityStatisticslVO.getVipDiscountAmount()!=null
- &&
- (tActivityStatisticslVO.getCouponDiscountAmount().compareTo(BigDecimal.ZERO)>0)){
+ if (tActivityStatisticslVO.getVipDiscountAmount()!=null){
vipActivity = vipActivity.add(tActivityStatisticslVO.getVipDiscountAmount());
}
tActivityStatisticslVO.setType("会员活动");
@@ -182,16 +177,23 @@
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;
}
}
- for (TActivityStatisticslVO tActivityStatisticslVO : list) {
+ List<Long> appUserIds = list.stream().map(TActivityStatisticslVO::getAppUserId).collect(Collectors.toList());
+ List<TAppUser> appUsers = appUserClient.getUserByIds(appUserIds).getData();
+
+ for (TActivityStatisticslVO tActivityStatisticslVO : list) {
+ TAppUser appUser = appUsers.stream().filter(user -> user.getId().equals(tActivityStatisticslVO.getAppUserId())).findFirst().orElse(null);
+ if(Objects.nonNull(appUser)){
+ tActivityStatisticslVO.setPhone(appUser.getPhone());
+ }
// 判断享有了哪些类型
switch (tActivityStatisticslVO.getOrderType()){
case 1:
@@ -200,12 +202,10 @@
// 充电订单 优惠券金额大于0
if (tActivityStatisticslVO.getCouponDiscountAmount()!=null
&&
- (tActivityStatisticslVO.getCouponDiscountAmount().compareTo(BigDecimal.ZERO)>0)){
- coupon = coupon.add(tActivityStatisticslVO.getCouponDiscountAmount());
- stringBuilder.append("优惠券抵扣").append("+");
- }
+ (tActivityStatisticslVO.getCouponDiscountAmount().compareTo(BigDecimal.ZERO)>0)){
+ stringBuilder.append("优惠券抵扣").append("+");
+ }
if (tActivityStatisticslVO.getVipDiscountAmount()!=null &&(tActivityStatisticslVO.getVipDiscountAmount().compareTo(BigDecimal.ZERO)>0)){
- discount = discount.add(tActivityStatisticslVO.getVipDiscountAmount());
stringBuilder.append("会员抵扣").append("+");
}
if (stringBuilder.length()>0){
@@ -221,13 +221,11 @@
if (tActivityStatisticslVO.getCouponDiscountAmount()!=null
&&
(tActivityStatisticslVO.getCouponDiscountAmount().compareTo(BigDecimal.ZERO)>0)){
- coupon = coupon.add(tActivityStatisticslVO.getCouponDiscountAmount());
stringBuilder1.append("优惠券抵扣").append("+");
}
if (tActivityStatisticslVO.getVipDiscountAmount()!=null
&&
(tActivityStatisticslVO.getVipDiscountAmount().compareTo(BigDecimal.ZERO)>0)){
- discount = discount.add(tActivityStatisticslVO.getVipDiscountAmount());
stringBuilder1.append("会员抵扣").append("+");
}
if (stringBuilder1.length()>0){
@@ -238,23 +236,16 @@
break;
case 3:
// 会员订单 优惠金额大于0
- if (tActivityStatisticslVO.getVipDiscountAmount()!=null
- &&
- (tActivityStatisticslVO.getCouponDiscountAmount().compareTo(BigDecimal.ZERO)>0)){
- vipActivity = vipActivity.add(tActivityStatisticslVO.getVipDiscountAmount());
- }
tActivityStatisticslVO.setType("会员活动");
tActivityStatisticslVO.setTime(tActivityStatisticslVO.getCreateTime());
break;
case 4:
// 赠送会员订单 如果支付金额为0 那么就是后台赠送的会员
if (tActivityStatisticslVO.getPaymentAmount().compareTo(BigDecimal.ZERO)==0){
- grantVip = grantVip.add(tActivityStatisticslVO.getOrderAmount());
tActivityStatisticslVO.setType("赠送会员");
tActivityStatisticslVO.setTime(tActivityStatisticslVO.getCreateTime());
}else{
// 赠送
- grantVip = grantVip.add(tActivityStatisticslVO.getVipDiscountAmount());
tActivityStatisticslVO.setType("赠送会员");
tActivityStatisticslVO.setTime(tActivityStatisticslVO.getCreateTime());
}
@@ -270,8 +261,8 @@
res.setGrantVip(grantVip);
return res;
}
-
-
+
+
/**
* 获取小程序商城购买订单列表
* @param query
@@ -318,8 +309,8 @@
map.put("total", count);
return map;
}
-
-
+
+
/**
* 获取购买订单详情
* @param id
@@ -331,7 +322,7 @@
MyShoppingOrderInfo info = new MyShoppingOrderInfo();
info.setId(id);
info.setStatus(shoppingOrder.getStatus());
- TAppUserAddress userAddress = appUserAddressClient.getAppUserAddressById(shoppingOrder.getAppUserAddressId()).getData();
+ TAppUserAddress userAddress = JSON.parseObject(shoppingOrder.getAddressJson(), TAppUserAddress.class);
info.setConsignee(userAddress.getName());
info.setPhone(userAddress.getPhone());
info.setAddress(userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getAddress() + userAddress.getHouseNumber());
@@ -369,8 +360,8 @@
}
return info;
}
-
-
+
+
/**
* 取消订单
* @param id
@@ -391,10 +382,10 @@
if(shoppingOrder.getPaymentAmount().compareTo(bigDecimal) == 0 && shoppingOrder.getStatus() == 4){
return AjaxResult.error("订单已取消，不能重复操作");
}
-
+
//退款金额
BigDecimal refundAmount = shoppingOrder.getPaymentAmount().subtract(bigDecimal);
-
+
//先查询第三方订单状态订单是否退款
//支付方式（1=微信，2=支付宝）
Integer paymentType = shoppingOrder.getPaymentType();
@@ -443,7 +434,7 @@
shoppingOrderRefund.setRefundRemark("全额退款");
shoppingOrderRefund.setRefundTotalAmount(refundAmount.add(bigDecimal));
shoppingOrderRefund.setPayAmount(shoppingOrder.getPaymentAmount());
-
+
shoppingOrder.setCancellationTime(LocalDateTime.now());
shoppingOrder.setCancellationId(shoppingOrder.getAppUserId());
if(1 == paymentType){
@@ -458,10 +449,16 @@
amount.setTotal(shoppingOrder.getPaymentAmount().multiply(new BigDecimal(100)).intValue());
amount.setCurrency("CNY");
model.setAmount(amount);
- R<String> orderR = wxPaymentClient.refundOrderR(model);
+ R<Map<String, Object>> orderR = wxPaymentClient.refundOrderR(model);
if(200 == orderR.getCode()){
this.updateById(shoppingOrder);
shoppingOrderRefundService.save(shoppingOrderRefund);
+ //手续费
+ Map<String, Object> amount1 = (Map<String, Object>) orderR.getData().get("amount");
+ 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);
}
}
if(2 == paymentType){
@@ -479,8 +476,8 @@
}
return AjaxResult.success();
}
-
-
+
+
/**
* 商城订单取消订单微信退款处理
* @param out_refund_no 退款单号
@@ -490,7 +487,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);
@@ -505,13 +501,13 @@
shoppingOrder.setRefundStatus(2);
shoppingOrder.setRefundTime(one.getRefundTime());
this.updateById(shoppingOrder);
-
+
//商品
if(shoppingOrder.getOrderType() == 1){
//redis锁 和支付使用同一个锁
- RedisLock redisLock = new RedisLock(redisTemplate, "SHOPPING_GOODS_LOCK", 5, 30000);
+ RLock lock = redissonClient.getLock("SHOPPING_GOODS_LOCK");
try {
- redisLock.lock();
+ lock.tryLock(5, 30, TimeUnit.SECONDS);
TGoods goods = goodsClient.getGoodsById(shoppingOrder.getGoodsId()).getData();
Integer inventory = goods.getInventory();
if(-1 != inventory){
@@ -522,15 +518,15 @@
e.printStackTrace();
}finally {
//解锁
- redisLock.unlock();
+ lock.unlock();
}
}
//优惠券
if(shoppingOrder.getOrderType() == 2){
//redis锁 和支付使用同一个锁
- RedisLock redisLock = new RedisLock(redisTemplate, "SHOPPING_COUPON_LOCK", 5, 30000);
+ RLock lock = redissonClient.getLock("SHOPPING_COUPON_LOCK");
try {
- redisLock.lock();
+ lock.tryLock(5, 30, TimeUnit.SECONDS);
TCoupon coupon = couponClient.getCouponById1(shoppingOrder.getCouponId()).getData();
Integer inventory = coupon.getInventoryQuantity();
if(-1 != inventory){
@@ -541,12 +537,12 @@
e.printStackTrace();
}finally {
//解锁
- redisLock.unlock();
+ lock.unlock();
}
}
return AjaxResult.success();
}
-
+
/**
* 获取未开票的订单列表
* @param query
@@ -651,10 +647,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