Merge branch 'dev' into test

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

@@ -1259,9 +1259,11 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 integralLog.setOperationType(YesNoEnum.yes.getIndex());
                 integralLog.setOperationTime(new Date());
                 integralLog.setCreateTime(new Date());
+                if (consumerMember.getIsRights().equals(YesNoEnum.yes.getIndex()) || consumerMember.getIsRecharge().equals(YesNoEnum.yes.getIndex())) {
                     integralLogService.save(integralLog);
                     consumerWalletService.updateById(consumerWallet);
                 }
+            }
                 MemberProgressLog memberProgressLog = new MemberProgressLog();
                 memberProgressLog.setConsumerId(sOrder.getConsumerId());
                 memberProgressLog.setCurrentProgress(consumerMember.getMembershipProgress());
@@ -1474,10 +1476,13 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 integralLog.setOperationType(YesNoEnum.no.getIndex());
                 integralLog.setOperationTime(new Date());
                 integralLog.setCreateTime(new Date());
-                integralLogService.save(integralLog);
                 consumerWallet.setRemainingIntegral(integral);
+                if ((consumerMember.getIsRecharge().equals(YesNoEnum.yes.getIndex()) || consumerMember.getIsRights().equals(YesNoEnum.yes.getIndex()))
+                        && membershipProgress.compareTo(BigDecimal.ZERO) >= 0) {
+                    integralLogService.save(integralLog);
                 consumerWalletService.updateById(consumerWallet);
                 }
+            }
             MemberProgressLog memberProgressLog = new MemberProgressLog();
             memberProgressLog.setConsumerId(sOrder.getConsumerId());
             memberProgressLog.setCurrentProgress(consumerMember.getMembershipProgress());