Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score

yudao-module-member/yudao-module-member-impl/src/main/resources/mapper/user/MemberUserScoreMapper.xml

@@ -61,9 +61,12 @@
             <if test="query.usedScoreOperate == 1">
                 and mus.used_score &gt; #{query.usedScore}
             </if>
-            <if test="query.usedScoreOperate == 2">
+            <if test="query.usedScoreOperate == 2 and query.usedScore != 0">
                 and mus.used_score = #{query.usedScore}
             </if>
+            <if test="query.usedScoreOperate == 2 and query.usedScore == 0">
+                and (mus.used_score = 0 or mus.used_score is null)
+            </if>
             <if test="query.usedScoreOperate == 3">
                 and mus.used_score &lt; #{query.usedScore}
             </if>
@@ -73,9 +76,13 @@
             <if test="query.holdScoreOperate == 1">
                 and mus.hold_score &gt; #{query.holdScore}
             </if>
-            <if test="query.holdScoreOperate == 2">
+            <if test="query.holdScoreOperate == 2 and query.holdScore != 0">
                 and mus.hold_score = #{query.holdScore}
             </if>
+            <!--特殊条件处理-->
+            <if test="query.holdScoreOperate == 2 and query.holdScore == 0">
+                and (mus.hold_score = 0 or mus.hold_score is null)
+            </if>
             <if test="query.holdScoreOperate == 3">
                 and mus.hold_score &lt; #{query.holdScore}
             </if>

yudao-module-reward/yudao-module-reward-api/src/main/java/cn/iocoder/yudao/module/reward/enums/ErrorCodeConstants.java

@@ -30,5 +30,6 @@ public interface ErrorCodeConstants {
     ErrorCode REDEEM_CANCEL_STATUS_ERROR = new ErrorCode(1001011024, "redeem.cancel.status.error");
     ErrorCode REWARD_NODE_AND_POINTS_LIST_ERROR = new ErrorCode(1001011025, "reward.node.and.points.list.error");
     ErrorCode REWARD_REDEEM_RECIPIENT_ERROR = new ErrorCode(1001011026, "reward.redeem.recipient.error");
+    ErrorCode REDEEM_IMPORT_NO_RECORD = new ErrorCode(1001011027, "redeem.import.no.record");
 }
 

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/service/redeem/RewardRedeemServiceImpl.java

@@ -228,7 +228,7 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
     @Override
     public RecordInfoImportRespVO recordImport(List<RedeemInfoImportExcelVO> dataList) {
         if (CollectionUtils.isEmpty(dataList)) {
-            return RecordInfoImportRespVO.builder().redeemIdFailedMap(Collections.emptyMap()).build();
+            throw exception(ErrorCodeConstants.REDEEM_IMPORT_NO_RECORD);
         }
         if (dataList.size() > MAX_IMPORT_RECORD_COUNT) {
             throw exception(ErrorCodeConstants.REDEEM_IMPORT_MAX_COUNT, MAX_IMPORT_RECORD_COUNT);

yudao-server/src/main/resources/i18n/messages_en.properties

@@ -1035,6 +1035,7 @@ reward.redeem.count.not.allow = bulk redemption is limited to a maximum of 10 pi
 reward.redeem.allow.count.error = the number of redemptions allowed by the individual has been exceeded:{}
 reward.node.and.points.list.error = reward node and points create error
 reward.redeem.recipient.error = recipient info information is incomplete
+redeem.import.no.record = no record in excel
 
 redeem.import.max.count = allow maximum number of imports is {}
 dict.unknown.error = Not in dict {0}: {1}

yudao-server/src/main/resources/i18n/messages_zh.properties

@@ -1030,6 +1030,7 @@ reward.redeem.count.not.allow = \u6279\u91CF\u5151\u6362\u6BCF\u6B21\u6700\u591A
 reward.redeem.allow.count.error = \u5DF2\u8D85\u51FA\u4E2A\u4EBA\u5141\u8BB8\u5151\u6362\u6B21\u6570\uFF1A{}
 reward.node.and.points.list.error = \u521B\u5EFA\u793C\u54C1\u7F51\u70B9\u6216\u6240\u9700\u79EF\u5206\u9519\u8BEF
 reward.redeem.recipient.error = \u793C\u54C1\u6536\u8D27\u4EBA\u4FE1\u606F\u4E0D\u5168
+redeem.import.no.record = \u8868\u683C\u4E2D\u65E0\u8BB0\u5F55
 
 get.lock.failed = \u670D\u52A1\u7E41\u5FD9\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5
 reward.redeem.not.exist = \u793C\u54C1\u5151\u6362\u8BB0\u5F55\u4E0D\u5B58\u5728