From 2dda6304029c95e171b2f9e32406eb4600d77ebd Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期三, 01 十一月 2023 18:57:58 +0800 Subject: [PATCH] 支付会员送券功能补充 运营商权限bug修改 --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java index a0b3d26..13e2d78 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java @@ -2,6 +2,7 @@ import com.dsh.course.feignClient.activity.BenefitsVideoClient; +import com.dsh.course.feignClient.activity.PointMercharsClient; import com.dsh.course.feignClient.activity.model.BenefitsVedioChangeStateVO; import com.dsh.course.feignClient.activity.model.BenefitsVideoClassification; import com.dsh.course.feignClient.activity.model.BenefitsVideos; @@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -176,12 +178,16 @@ List<TQueryBenefitsVideosVO> courseByCourseIds = courseClient.getCourseByCourseIds(vo); for (BenefitsVideos benefitsVideos : benefitVideoById) { for (TQueryBenefitsVideosVO courseByCourseId : courseByCourseIds) { - if (benefitsVideos.getCourseId() == courseByCourseId.getId()){ + if (benefitsVideos.getCourseId().equals(courseByCourseId.getId())){ courseByCourseId.setIntegral(benefitsVideos.getIntegral()); courseByCourseId.setBenefitsVideosId(benefitsVideos.getId()); + courseByCourseId.setState(benefitsVideos.getState()); } } } + + + return courseByCourseIds; } /** @@ -227,10 +233,16 @@ * * @return */ + + @Resource + private PointMercharsClient mercharsClient; @RequestMapping("/changeCourseState") @ResponseBody public Object changeCourseState(@RequestBody CourseChangeStateDTO dto){ + courseClient.changeState(dto); + mercharsClient.changeState(dto); + return ResultUtil.success(); } -- Gitblit v1.7.1