修改订单退款

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

@@ -1303,7 +1303,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 }
             }
 
-            if (ObjectUtil.isNotEmpty(consumerWallet) && integral.compareTo(BigDecimal.ZERO) > 0) {
+            if (ObjectUtil.isNotEmpty(consumerWallet) && integral.compareTo(BigDecimal.ZERO) >= 0) {
                 IntegralLog integralLog = new IntegralLog();
                 integralLog.setConsumerId(sOrder.getConsumerId());
                 integralLog.setCurrentIntegral(consumerWallet.getRemainingIntegral());
@@ -1366,7 +1366,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
             memberProgressLog.setCreateTime(new Date());
             Long validityPeriod = memberConfigService.getById(consumerMember.getMemberConfigId()).getValidityPeriod();
             memberProgressLog.setExpirationTime(DateUtils.addYears(new Date(), validityPeriod.intValue()));
-            if (!consumerMember.getMemberType().equals(MemberTypeEnum.NORMAL.getIndex()) && membershipProgress.compareTo(BigDecimal.ZERO) > 0) {
+            if (!consumerMember.getMemberType().equals(MemberTypeEnum.NORMAL.getIndex()) && membershipProgress.compareTo(BigDecimal.ZERO) >= 0) {
                 memberProgressLogService.save(memberProgressLog);
                 consumerMemberService.updateConsumerMember(consumerMember);
             }