Merge branch 'refs/heads/test'

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

@@ -181,6 +181,8 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
                     consumerWalletService.editConsumerWallet(consumerWallet, recharge, one);
                 }
             }
+            one.setIsRecharge(YesNoEnum.yes.getIndex());
+            consumerMemberService.updateConsumerMember(one);
         }
         updateRecharge(recharge);
     }
@@ -249,6 +251,7 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
         if (ObjectUtil.isEmpty(byId)) {
             throw new BaseException("充值模板异常");
         }
+        recharge.setRechargeAmount(byId.getRechargeAmount());
         if (byId.getGiveType().contains(GiveTypeEnum.AMOUNT.getIndex())) {
             recharge.setGiveAmount(byId.getGiveAmount());
         } else {
@@ -265,7 +268,6 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
         } else {
             recharge.setGiveIntegral(BigDecimal.ZERO);
         }
-        recharge.setRechargeAmount(byId.getRechargeAmount());
         recharge.setGiveType(byId.getGiveType());
         recharge.setStatus(YesNoEnum.no.getIndex());
         recharge.setConsumerId(user.getId());