Merge branch 'refs/heads/dev' into test

share-system/src/main/java/share/system/service/impl/EquityMembersOrderServiceImpl.java

@@ -10,7 +10,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import share.common.core.redis.RedisUtil;
 import share.common.enums.MemberTypeEnum;
 import share.common.enums.ReceiptRdeisEnum;
@@ -160,7 +159,7 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
         return equityMembersOrderMapper.getInfoByEntity(equityMembersOrderParam);
     }
 
-    @Transactional(rollbackFor = Exception.class)
+    //    @Transactional(rollbackFor = Exception.class)
     @Override
     public void paymentSuccessful(EquityMembersOrder equityMembersOrder) {
         ConsumerMember consumerMember = consumerMemberService.getOne(new LambdaQueryWrapper<ConsumerMember>().eq(ConsumerMember::getConsumerId, equityMembersOrder.getConsumerId()));

share-system/src/main/java/share/system/service/impl/RechargeServiceImpl.java

@@ -149,7 +149,7 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
         return baseMapper.getInfoByEntity(rechargeParam);
     }
 
-    @Transactional(rollbackFor = Exception.class)
+    //    @Transactional(rollbackFor = Exception.class)
     @Override
     public void paymentSuccessful(Recharge recharge) {
         ConsumerMember one = consumerMemberService.getOne(new LambdaQueryWrapper<ConsumerMember>().eq(ConsumerMember::getConsumerId, recharge.getConsumerId()));

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -1816,6 +1816,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         return convertDosToVos(orderList);
     }
 
+    //    @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void paymentSuccessful(SOrder sOrder) {