热刺管理管理端增基本操作及学生端查询；学员管理增加学院账户基本信息获取

mec-web/src/main/java/com/ym/mec/web/controller/student/HotWordLabelController.java

@@ -0,0 +1,31 @@
+package com.ym.mec.web.controller.student;
+
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.QueryInfo;
+import com.ym.mec.web.service.HotWordsLabelService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author Joburgess
+ * @Date 2019/9/21
+ */
+@Api("热词标签")
+@RequestMapping("hotWordLabel")
+@RestController
+public class HotWordLabelController extends BaseController {
+
+    @Autowired
+    private HotWordsLabelService hotWordsLabelService;
+
+    @ApiOperation("分页查询热词列表")
+    @PostMapping("/queryPage")
+    public Object queryPage(QueryInfo queryInfo){
+        return succeed(hotWordsLabelService.queryPage(queryInfo));
+    }
+
+}

mec-web/src/main/java/com/ym/mec/web/controller/system/HotWordLabelManageController.java

@@ -0,0 +1,61 @@
+package com.ym.mec.web.controller.system;
+
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.QueryInfo;
+import com.ym.mec.web.dal.entity.HotWordsLabel;
+import com.ym.mec.web.service.HotWordsLabelService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+
+/**
+ * @Author Joburgess
+ * @Date 2019/9/21
+ */
+@Api("热词标签管理")
+@RequestMapping("studentManage")
+@RestController
+public class HotWordLabelManageController extends BaseController {
+
+    @Autowired
+    private HotWordsLabelService hotWordsLabelService;
+
+
+
+    @ApiOperation(value = "新增热词标签")
+    @PostMapping("/add")
+    public Object add(HotWordsLabel hotWordsLabel) {
+        hotWordsLabelService.insert(hotWordsLabel);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除热词标签")
+    @PostMapping("/del/{id}")
+    public Object del(@ApiParam(value = "热词标签编号", required = true) @PathVariable("id") Integer id) {
+        hotWordsLabelService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改热词标签")
+    @PostMapping("/update")
+    public Object update(HotWordsLabel hotWordsLabel) {
+        hotWordsLabel.setUpdateTime(new Date());
+        hotWordsLabelService.update(hotWordsLabel);
+        return succeed();
+    }
+
+
+    @ApiOperation("分页查询热词列表")
+    @PostMapping("/queryPage")
+    public Object queryPage(QueryInfo queryInfo){
+        return succeed(hotWordsLabelService.queryPage(queryInfo));
+    }
+
+}

mec-web/src/main/java/com/ym/mec/web/controller/system/StudentManageController.java

@@ -5,6 +5,7 @@ import com.ym.mec.web.dal.page.StudentManageAttendanceQueryInfo;
 import com.ym.mec.web.dal.page.StudentManageCourseQueryInfo;
 import com.ym.mec.web.dal.page.StudentManageQueryInfo;
 import com.ym.mec.web.service.StudentManageService;
+import com.ym.mec.web.service.SysUserCashAccountService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -23,6 +24,9 @@ public class StudentManageController extends BaseController {
     @Autowired
     private StudentManageService studentManageService;
 
+    @Autowired
+    private SysUserCashAccountService sysUserCashAccountService;
+
     @ApiOperation(value = "获取学生列表")
     @GetMapping("/queryStudentList")
     public Object queryStudentList(@RequestBody StudentManageQueryInfo queryInfo){
@@ -59,4 +63,10 @@ public class StudentManageController extends BaseController {
         return succeed(studentManageService.findStudentVipGroups(userId));
     }
 
+    @ApiOperation(value = "获取用户默认账户基本信息")
+    @PostMapping("/getUserCashAccountBaseInfo/{userID}")
+    public Object getUserCashAccountBaseInfo(@PathVariable("userID") Long userID){
+        return succeed(studentManageService.getStudentAccountBaseInfo(userID));
+    }
+
 }

mec-web/src/main/java/com/ym/mec/web/dal/dao/StudentManageDao.java

@@ -1,9 +1,6 @@
 package com.ym.mec.web.dal.dao;
 
-import com.ym.mec.web.dal.dto.StudentManageBaseDto;
-import com.ym.mec.web.dal.dto.StudentManageBaseInfoOfMusicGroupDto;
-import com.ym.mec.web.dal.dto.StudentManageCourseListDto;
-import com.ym.mec.web.dal.dto.StudentManageListDto;
+import com.ym.mec.web.dal.dto.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -78,4 +75,11 @@ public interface StudentManageDao {
      */
     int countStudentAttendances(Map<String,Object> params);
 
+    /**
+     * @Author: Joburgess
+     * @Date: 2019/9/21
+     * 获取学上账户基本信息
+     */
+    StudentManageAccountBaseInfoDto getStudentAccountBaseInfo(Long userID);
+
 }

mec-web/src/main/java/com/ym/mec/web/dal/dto/StudentManageAccountBaseInfoDto.java

@@ -0,0 +1,45 @@
+package com.ym.mec.web.dal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author Joburgess
+ * @Date 2019/9/21
+ */
+public class StudentManageAccountBaseInfoDto {
+
+    @ApiModelProperty(value = "账户余额",required = false)
+    private BigDecimal balance;
+
+    @ApiModelProperty(value = "银行名称",required = false)
+    private String bankName;
+
+    @ApiModelProperty(value = "银行卡号",required = false)
+    private String cardNo;
+
+    public BigDecimal getBalance() {
+        return balance;
+    }
+
+    public void setBalance(BigDecimal balance) {
+        this.balance = balance;
+    }
+
+    public String getBankName() {
+        return bankName;
+    }
+
+    public void setBankName(String bankName) {
+        this.bankName = bankName;
+    }
+
+    public String getCardNo() {
+        return cardNo;
+    }
+
+    public void setCardNo(String cardNo) {
+        this.cardNo = cardNo;
+    }
+}

mec-web/src/main/java/com/ym/mec/web/service/StudentManageService.java

@@ -1,6 +1,7 @@
 package com.ym.mec.web.service;
 
 import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.web.dal.dto.StudentManageAccountBaseInfoDto;
 import com.ym.mec.web.dal.dto.StudentManageBaseDto;
 import com.ym.mec.web.dal.dto.StudentManageBaseInfoOfMusicGroupDto;
 import com.ym.mec.web.dal.dto.StudentManageVipGroupDto;
@@ -58,4 +59,11 @@ public interface StudentManageService {
      */
     List<StudentManageVipGroupDto> findStudentVipGroups(Long userID);
 
+    /**
+     * @Author: Joburgess
+     * @Date: 2019/9/21
+     * 获取学上账户基本信息
+     */
+    StudentManageAccountBaseInfoDto getStudentAccountBaseInfo(Long userID);
+
 }

mec-web/src/main/java/com/ym/mec/web/service/impl/StudentManageServiceImpl.java

@@ -6,10 +6,7 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.web.dal.dao.StudentManageDao;
 import com.ym.mec.web.dal.dao.VipGroupDao;
-import com.ym.mec.web.dal.dto.StudentManageBaseDto;
-import com.ym.mec.web.dal.dto.StudentManageBaseInfoOfMusicGroupDto;
-import com.ym.mec.web.dal.dto.StudentManageListDto;
-import com.ym.mec.web.dal.dto.StudentManageVipGroupDto;
+import com.ym.mec.web.dal.dto.*;
 import com.ym.mec.web.dal.page.StudentManageAttendanceQueryInfo;
 import com.ym.mec.web.dal.page.StudentManageCourseQueryInfo;
 import com.ym.mec.web.dal.page.StudentManageQueryInfo;
@@ -117,4 +114,9 @@ public class StudentManageServiceImpl implements StudentManageService {
     public List<StudentManageVipGroupDto> findStudentVipGroups(Long userID) {
         return vipGroupDao.findStudentVipGroups(userID);
     }
+
+    @Override
+    public StudentManageAccountBaseInfoDto getStudentAccountBaseInfo(Long userID) {
+        return studentManageDao.getStudentAccountBaseInfo(userID);
+    }
 }

mec-web/src/main/resources/config/mybatis/StudentManageDao.xml

@@ -41,6 +41,12 @@
         <result property="attendanceStatus" column="status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
 
+    <resultMap id="studentManageAccountBaseInfo" type="com.ym.mec.web.dal.dto.StudentManageAccountBaseInfoDto">
+        <result property="balance" column="balance_"/>
+        <result property="bankName" column="bank_name_"/>
+        <result property="cardNo" column="card_no_"/>
+    </resultMap>
+
     <sql id="queryCondition">
         <where>
             cgsm.user_id_ IS NOT NULL
@@ -261,4 +267,17 @@
         <include refid="studentManageAttendanceQueryCondition"/>
     </select>
 
+    <select id="getStudentAccountBaseInfo" resultMap="studentManageAccountBaseInfo">
+        SELECT
+            suca.balance_,
+            subc.bank_name_,
+            subc.card_no_
+        FROM
+            sys_user_cash_account suca
+            LEFT JOIN sys_user_bank_card subc ON suca.user_id_ = subc.user_id_
+            AND subc.is_default_ = 1
+        WHERE
+            suca.user_id_ =#{userID}
+    </select>
+
 </mapper>