Merge branch 'dev' into test

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

@@ -296,6 +296,7 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
             if (ObjectUtil.isNotEmpty(one) && consumerMember.getMembershipProgress().compareTo(BigDecimal.valueOf(one.getLimitRequirements())) >= 0) {
                 consumerMember.setMembershipLevel(consumerMember.getMembershipLevel() + 1L);
 //                consumerMember.setMemberConfigId(one.getId());
+                consumerMemberService.updateConsumerMember(consumerMember);
             }
         }
     }

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

@@ -184,9 +184,11 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
                     //修改会员钱包
                     consumerWalletService.editConsumerWallet(consumerWallet, recharge, one);
                 }
+            } else {
+                one.setIsRecharge(YesNoEnum.yes.getIndex());
+                consumerMemberService.updateConsumerMember(one);
+                consumerWalletService.editConsumerWallet(consumerWallet, recharge, one);
             }
-            one.setIsRecharge(YesNoEnum.yes.getIndex());
-            consumerMemberService.updateConsumerMember(one);
         }
         updateRecharge(recharge);
     }