Merge branch 'refs/heads/dev' into test

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

@@ -250,9 +250,9 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
             throw new BaseException("充值模板异常");
         }
         if (byId.getGiveType().contains(GiveTypeEnum.AMOUNT.getIndex())) {
-            recharge.setRechargeAmount(byId.getRechargeAmount());
+            recharge.setGiveAmount(byId.getGiveAmount());
         } else {
-            recharge.setRechargeAmount(BigDecimal.ZERO);
+            recharge.setGiveAmount(BigDecimal.ZERO);
         }
         if (byId.getGiveType().contains(GiveTypeEnum.DURATION.getIndex())) {
             recharge.setGiveDuration(byId.getGiveDuration());
@@ -265,7 +265,7 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
         } else {
             recharge.setGiveIntegral(BigDecimal.ZERO);
         }
-        recharge.setGiveAmount(byId.getGiveAmount());
+        recharge.setRechargeAmount(byId.getRechargeAmount());
         recharge.setGiveType(byId.getGiveType());
         recharge.setStatus(YesNoEnum.no.getIndex());
         recharge.setConsumerId(user.getId());