From 41c07e4558ed3a1cbdda0711f78cd3a812c06829 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 28 九月 2023 18:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java |   41 +++++++++++++++++++++++++++++++----------
 1 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
index 5373667..8bf7816 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
@@ -104,7 +104,7 @@
      */
     @RequestMapping("/changelist/{payId}")
     @ResponseBody
-    public ResultUtil changelist(@PathVariable("payId") Integer payId, ConsumeQuery consumeQuery) {
+    public ResultUtil changelist(@PathVariable("payId") Long payId, ConsumeQuery consumeQuery) {
         consumeQuery.setPayId(payId);
         System.out.println("=======changelist==========="+consumeQuery);
         List<CourseCounsum> courseCounsums =   courseStuddentClient.queryCounsum(consumeQuery);
@@ -194,6 +194,9 @@
             payment.setId(Long.valueOf(tCoursePackage.getId()));
 
             BigDecimal cashPayment = payment.getCashPayment();
+            if (cashPayment==null){
+                cashPayment = BigDecimal.ZERO;
+            }
             Integer totalClassHours = payment.getTotalClassHours();
             BigDecimal result =  new BigDecimal(0);
             if (totalClassHours!=0) {
@@ -360,6 +363,8 @@
         return ResultUtil.success();
     }
 
+//同意退款
+
     @RequestMapping("/changeStatus/{id}")
     @ResponseBody
     public ResultUtil changeStatus(@PathVariable Integer id) {
@@ -375,6 +380,21 @@
         return new ResultUtil<>(0,0,"同意成功",null,null);
     }
 
+    @RequestMapping("/noStatus/{id}")
+    @ResponseBody
+    public ResultUtil noStatus(@PathVariable Integer id) {
+//        InsertBackDto insertBackDto= new InsertBackDto();
+//        insertBackDto.setId(id);
+////        insertBackDto.setIds(ids);
+//        System.out.println("=====insertBackDto========"+insertBackDto);
+
+        courseStuddentClient.changeStatus(id);
+        courseStuddentClient.backStausClass(id);
+//        courseStuddentClient.zeroClass(id);
+
+        System.out.println("============学员查询接口=========");
+        return new ResultUtil<>(0,0,"同意成功",null,null);
+    }
 
     /**
      * 学员修改
@@ -430,7 +450,7 @@
         historyClient.createHistory(historyDto);
 
 
-        return ResultUtil.success();
+        return new ResultUtil<>(0,0,"更改成功",null,null);
 
     }
 
@@ -453,7 +473,7 @@
      */
     @RequestMapping(value = "/getUserSlect/{id}")
     @ResponseBody
-    public ResultUtil getUserSlect(@PathVariable("id") Integer payId) {
+    public ResultUtil getUserSlect(@PathVariable("id") Long payId) {
 
        List<SelectDto>  selectDtos =  courseStuddentClient.getSelect(payId);
         Map<String,List<SelectDto>> map = new HashMap<>();
@@ -466,7 +486,7 @@
      */
     @RequestMapping(value = "/toClass")
     @ResponseBody
-    public ResultUtil toClass( Integer id,Integer toStudentId) {
+    public ResultUtil toClass( Long id,Integer toStudentId) {
         ToClassDto toClassDto = new ToClassDto();
         toClassDto.setToStudentId(toStudentId);
         toClassDto.setId(id);
@@ -536,10 +556,11 @@
         System.out.println("========ToHoliDto========="+resultUtil);
 
 
-        if (resultUtil==""){
+        if (resultUtil==""||resultUtil==null){
             return new ResultUtil<>(0,0,"报名成功");
-        }else
-        return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);
+        }else{
+        return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);}
+
     }
 
 
@@ -562,15 +583,15 @@
 
         if (resultUtil==""){
             return new ResultUtil<>(0,0,"报名成功");
-        }else
-            return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);
+        }else{
+            return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);}
     }
 
     //赠课
 
     @RequestMapping(value = "/giftTo")
     @ResponseBody
-    public ResultUtil toClagiftToss( Integer id,Integer toStudentId) {
+    public ResultUtil toClagiftToss( Long id,Integer toStudentId) {
         ToClassDto toClassDto = new ToClassDto();
         toClassDto.setToStudentId(toStudentId);
         toClassDto.setId(id);

--
Gitblit v1.7.1