Merge branch 'refs/heads/feature_member_score' into dev

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/userScore/vo/AppMemberUserScoreLogRespVO.java

@@ -23,8 +23,10 @@ public class AppMemberUserScoreLogRespVO {
     @ApiModelProperty(value = "操作类型")
     private String operateType;
     @ApiModelProperty(value = "积分来源")
+    private Integer sourceType;
+    @ApiModelProperty(value = "积分来源中文")
     private String sourceTypeZh;
-    @ApiModelProperty(value = "积分来源")
+    @ApiModelProperty(value = "积分来源英文")
     private String sourceTypeEn;
     @ApiModelProperty(value = "积分规则id")
     private Long ruleId;

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/scoreLog/MemberUserScoreLogServiceImpl.java

@@ -101,6 +101,7 @@ public class MemberUserScoreLogServiceImpl extends AbstractService<MemberUserSco
 
     private void setScoreRuleLogDetail(MemberUserScoreLogDO userScoreLogDO, ArrayList<AppMemberUserScoreLogRespVO> appMemberUserScoreLogRespVOS) {
         AppMemberUserScoreLogRespVO appMemberUserScoreLogRespVO = new AppMemberUserScoreLogRespVO();
+        appMemberUserScoreLogRespVO.setSourceType(userScoreLogDO.getSourceType());
         appMemberUserScoreLogRespVO.setScoreCount(userScoreLogDO.getScoreCount());
         appMemberUserScoreLogRespVO.setOperateType(userScoreLogDO.getOperateType() == 1 ? "+" : "-");
         appMemberUserScoreLogRespVO.setCreateTime(userScoreLogDO.getCreateTime());

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

@@ -133,6 +133,7 @@ public class RewardServiceImpl extends AbstractService<RewardMapper, RewardDO> i
 
             //已启用可编辑剩余数量和备注
         } else if (rewardDO.getStatus() == RewardStatusEnum.ENABLED.getValue()) {
+            updateObj.setId(updateReqVO.getId());
             updateObj.setQuantityRemain(updateReqVO.getQuantityRemain());
             updateObj.setRemarkEn(updateReqVO.getRemarkEn());
             updateObj.setRemarkFr(updateReqVO.getRemarkFr());