Merge branch 'dev' into test

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

@@ -269,7 +269,7 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
             memberProgressLog.setConsumerId(equityMembersOrder.getConsumerId());
             memberProgressLog.setCurrentProgress(consumerMember.getMembershipProgress());
             consumerMember.setMembershipProgress(equityMembersOrderConfig.getGiftPoints().add(consumerMember.getMembershipProgress()));
-            memberProgressLog.setVariableProgress(equityMembersOrderConfig.getGiftPoints().add(consumerMember.getMembershipProgress()));
+            memberProgressLog.setVariableProgress(equityMembersOrderConfig.getGiftPoints());
             memberProgressLog.setOperationType(YesNoEnum.yes.getIndex());
             memberProgressLog.setOperationTime(new Date());
             memberProgressLog.setCreateTime(new Date());
@@ -279,7 +279,7 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
             integralLog.setConsumerId(equityMembersOrder.getConsumerId());
             integralLog.setCurrentIntegral(consumerMember.getMembershipProgress());
             consumerWallet.setRemainingIntegral(consumerWallet.getRemainingIntegral().add(equityMembersOrderConfig.getGiftPoints()));
-            integralLog.setVariableIntegral(equityMembersOrderConfig.getGiftPoints().add(consumerWallet.getRemainingIntegral()));
+            integralLog.setVariableIntegral(equityMembersOrderConfig.getGiftPoints());
             integralLog.setOperationType(YesNoEnum.yes.getIndex());
             integralLog.setOperationTime(new Date());
             integralLog.setCreateTime(new Date());