Merge branch 'release-feat-zhangfeng' into 'release'

bugfix-484: 积分规则启用校验修改

See merge request !23

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/scoreRule/ScoreRuleServiceImpl.java

@@ -386,12 +386,14 @@ public class ScoreRuleServiceImpl extends AbstractService<ScoreRuleMapper, Score
                 throw exception(SCORE_RULE_TIME_ERROR);
             }
             //如果是启用，校验同一个规则下，有效期内有没有重复的规则设置，分享不校验
+            if (scoreRuleDO.getType() != ScoreRuleTypeEnum.SHARE.getValue()) {
                 if (scoreRuleDO.getType() == ScoreRuleTypeEnum.ORDER_V.getValue()) {
                     ScoreRuleOrderVExtraVO extraOrderV = JSONUtil.toBean(scoreRuleDO.getExtra(), ScoreRuleOrderVExtraVO.class);
                     scoreRuleUniqueCheck(scoreRuleDO.getType(), extraOrderV.getTransportType(), scoreRuleDO.getStartTime(), scoreRuleDO.getEndTime(), null);
                 } else {
                     scoreRuleUniqueCheck(scoreRuleDO.getType(), null, scoreRuleDO.getStartTime(), scoreRuleDO.getEndTime(), null);
                 }
+            }
             upScoreRuleDO.setStatus(scoreRuleStatusReqVO.getStatus());
         } else {
             throw exception(SCORE_RULE_STATUS_ERROR);