From c3a72e424535647c7e50380759552dd5957d25e0 Mon Sep 17 00:00:00 2001
From: tangqian <tangqian..110>
Date: Thu, 25 May 2023 18:46:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=85=85=E5=80=BC=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/order/impl/StoreOrderServiceImpl.java   |  6 +++---
 .../service/recharge/PhoneRecordServiceImpl.java    | 13 ++++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
index ecccfd747..42eca6e55 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
@@ -1262,11 +1262,11 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
             RechargeGearDO rechargeGearDO = rechargeGearService.getRechargeGear(rechargeGearId.toString());
             PhoneRecordDO phoneRecordDO = new PhoneRecordDO();
             PhoneRecordAdd phoneRecordAdd = new PhoneRecordAdd();
-            phoneRecordDO.setUserId(Long.valueOf(orderDO.getUid()));
-            phoneRecordDO.setRechargeOrderId(Long.valueOf(orderDO.getId()));
+            phoneRecordDO.setUserId(orderDO.getUid());
+            phoneRecordDO.setRechargeOrderId(orderDO.getId());
             phoneRecordDO.setPhone(orderDO.getUserPhone());
             phoneRecordDO.setRefundFeeAmount(replace(info.getPrice()));
-            phoneRecordDO.setRechargeGearId(Long.valueOf(info.getRechargeGearId()));
+            phoneRecordDO.setRechargeGearId(info.getRechargeGearId());
             LocalDateTime localDateTime = LocalDateTime.now();
             LocalDateTime newLocalDateTime = LocalDateTimeUtil.offset(localDateTime, 12, ChronoUnit.MONTHS);
             phoneRecordDO.setRefundFeeEndDate(newLocalDateTime);
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/PhoneRecordServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/PhoneRecordServiceImpl.java
index e10907369..ef6f52eff 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/PhoneRecordServiceImpl.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/PhoneRecordServiceImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
 import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
 import cn.iocoder.yudao.module.shop.controller.app.recharge.vo.PhoneRecordAdd;
@@ -18,10 +19,12 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 import cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.*;
 import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.PhoneRecordDO;
@@ -81,16 +84,16 @@ public class PhoneRecordServiceImpl implements PhoneRecordService {
     }
 
     @Override
+    @TenantIgnore
+    @Transactional
     public Boolean deletePhoneGearByOrderId(Long orderId) {
         log.info("-------------------------orderId{}",orderId);
         List<PhoneRecordDO> recordDOS = phoneRecordMapper.selectList(Wrappers.<PhoneRecordDO>lambdaQuery().eq(PhoneRecordDO::getRechargeOrderId, orderId));
         log.info("-------------------------recordDOS{},{}",recordDOS,recordDOS.size());
         if (!CollectionUtils.isEmpty(recordDOS)) {
-            recordDOS.forEach(e->{
-                e.setDeleted(Boolean.TRUE);
-                int i = phoneRecordMapper.updateById(e);
-                log.info("-------------------------i{}---------------------",i);
-            });
+            Set<Long> ids = recordDOS.stream().map(PhoneRecordDO::getId).collect(Collectors.toSet());
+            log.info("-------------------------ids{}",ids);
+            phoneRecordMapper.deleteBatchIds(ids);
         }
         return null;
     }

From 38b5bfde5d57e8d1d82998ebdca579d6e510e688 Mon Sep 17 00:00:00 2001
From: tangqian <tangqian..110>
Date: Fri, 26 May 2023 09:24:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=85=85=E5=80=BC=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/shop/service/recharge/PhoneRecordServiceImpl.java   | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/PhoneRecordServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/PhoneRecordServiceImpl.java
index ef6f52eff..b4432b44e 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/PhoneRecordServiceImpl.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/PhoneRecordServiceImpl.java
@@ -87,12 +87,9 @@ public class PhoneRecordServiceImpl implements PhoneRecordService {
     @TenantIgnore
     @Transactional
     public Boolean deletePhoneGearByOrderId(Long orderId) {
-        log.info("-------------------------orderId{}",orderId);
         List<PhoneRecordDO> recordDOS = phoneRecordMapper.selectList(Wrappers.<PhoneRecordDO>lambdaQuery().eq(PhoneRecordDO::getRechargeOrderId, orderId));
-        log.info("-------------------------recordDOS{},{}",recordDOS,recordDOS.size());
         if (!CollectionUtils.isEmpty(recordDOS)) {
             Set<Long> ids = recordDOS.stream().map(PhoneRecordDO::getId).collect(Collectors.toSet());
-            log.info("-------------------------ids{}",ids);
             phoneRecordMapper.deleteBatchIds(ids);
         }
         return null;