From 8e524f6e570fca66f670a8072edefc6ca2d4e2f9 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 01 十一月 2023 08:55:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 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 cfff158..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;
@@ -179,9 +181,13 @@
                 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