兑换记录兑换网点修改

yudao-module-reward/yudao-module-reward-api/src/main/java/cn/iocoder/yudao/module/reward/api/reward/dto/RedeemRewardReqVO.java

@@ -28,6 +28,9 @@ public class RedeemRewardReqVO {
     @ApiModelProperty(value = "兑换入口（后台，app，web）", required = true)
     private Integer entrance;
 
+    @ApiModelProperty(value = "兑换网点，仅上门领取时填")
+    private Integer nodeId;
+
     @ApiModelProperty(value = "费用数字（两位小数）")
     private BigDecimal expenses;
 

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/dal/dataobject/redeem/RewardRedeemDO.java

@@ -46,6 +46,10 @@ public class RewardRedeemDO extends BaseDO {
      * 兑换入口
      */
     private Integer entrance;
+    /**
+     * 兑换网点
+     */
+    private Integer nodeId;
     /**
      * 费用
      */

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/vo/reward/RewardRedeemUpdateReqVO.java

@@ -15,6 +15,8 @@ public class RewardRedeemUpdateReqVO {
     @NotNull(message = "redeemType is not null")
     @ApiModelProperty(value = "兑换方式")
     private Integer redeemType;
+    @ApiModelProperty(value = "兑换网点，仅上门领取时填")
+    private Integer nodeId;
     @ApiModelProperty(value = "费用")
     private BigDecimal expenses;
     @ApiModelProperty(value = "币种")

yudao-module-reward/yudao-module-reward-impl/src/main/resources/mapper/RewardRedeemMapper.xml

@@ -15,7 +15,7 @@
         from ecw_reward_redeem err
         left join ecw_reward er on err.reward_id = er.id
         left join member_user mu on mu.id = err.member_id
-        left join ecw_node en on er.node_id = en.id
+        left join ecw_node en on err.node_id = en.id
         left join system_user suc on suc.id = er.creator
         left join system_user suu on suu.id = er.updater
         left join ecw_currency cc on err.currency = cc.id
@@ -30,7 +30,7 @@
         from ecw_reward_redeem err
         left join ecw_reward er on err.reward_id = er.id
         left join member_user mu on mu.id = err.member_id
-        left join ecw_node en on er.node_id = en.id
+        left join ecw_node en on err.node_id = en.id
         left join system_user suc on suc.id = er.creator
         left join system_user suu on suu.id = er.updater
         left join ecw_express ee on err.courier_company = ee.id
@@ -48,7 +48,7 @@
         left join ecw_reward er on err.reward_id = er.id
         left join member_user mu on mu.id = err.member_id
         left join member_user_score mus on mu.id = mus.member_id
-        left join ecw_node en on er.node_id = en.id
+        left join ecw_node en on err.node_id = en.id
         left join system_user suc on suc.id = er.creator
         left join system_user suu on suu.id = er.updater
         left join ecw_currency cc on err.currency = cc.id
@@ -61,7 +61,7 @@
         from ecw_reward_redeem err
         left join ecw_reward er on err.reward_id = er.id
         left join member_user mu on mu.id = err.member_id
-        left join ecw_node en on er.node_id = en.id
+        left join ecw_node en on err.node_id = en.id
         left join system_user suc on suc.id = er.creator
         left join system_user suu on suu.id = er.updater
         left join ecw_currency cc on err.currency = cc.id
@@ -136,7 +136,7 @@
             and err.entrance = #{req.entrance}
         </if>
         <if test="req.nodeId != null">
-            and er.node_id = #{req.nodeId}
+            and err.node_id = #{req.nodeId}
         </if>
         <if test="req.rewardCount != null and req.rewardCountOperate != null">
             <!--1:大于 2:等于 3:小于-->