Merge branch 'refs/heads/dev' into test

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

@@ -174,7 +174,7 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
                     .eq(MemberConfig::getMembershipLevel, one.getMembershipLevel() + 1L));
             if (ObjectUtil.isNotEmpty(newOne) && one.getMembershipProgress().compareTo(BigDecimal.valueOf(newOne.getLimitRequirements())) >= 0) {
                 one.setMembershipLevel(one.getMembershipLevel() + 1L);
-                one.setMemberConfigId(one.getId());
+                one.setMemberConfigId(newOne.getId());
                 consumerMemberService.updateConsumerMember(one);
             }
         }

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

@@ -10,6 +10,7 @@ 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;
@@ -159,6 +160,7 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
         return equityMembersOrderMapper.getInfoByEntity(equityMembersOrderParam);
     }
 
+    @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,6 +149,7 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
         return baseMapper.getInfoByEntity(rechargeParam);
     }
 
+    @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

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