Merge remote-tracking branch 'origin/master'

cms/src/main/java/com/ym/mec/cms/controller/queryinfo/NewsInformationQueryInfo.java

@@ -9,7 +9,7 @@ import com.ym.mec.common.page.QueryInfo;
 
 public class NewsInformationQueryInfo extends QueryInfo {
 
-	@ApiModelProperty(value = "资讯类型", required = false)
+	@ApiModelProperty(value = "类型,1精彩活动，2热门资讯,3banner类型", required = false)
 	private Integer type;
 
 	@ApiModelProperty(value = "资讯状态", required = false)

cms/src/main/java/com/ym/mec/cms/dal/entity/SysNewsInformation.java

@@ -24,7 +24,7 @@ public class SysNewsInformation {
 	private String coverImage;
 
 	/** 类型 */
-	@ApiModelProperty(value = "类型,1精彩活动，2热门资讯", required = true)
+	@ApiModelProperty(value = "类型,1精彩活动，2热门资讯,3banner类型", required = true)
 	private Integer type;
 
 	/** 状态（1-可见 0-不可见） */

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/fallback/SysUserFeignServiceFallback.java

@@ -16,6 +16,7 @@ public class SysUserFeignServiceFallback implements SysUserFeignService {
 
 	@Override
 	public Object test() {
+		System.out.println("******进入服务降级方法******");
 		return "服务正在拍";
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysUserBankCardDao.java

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.SysUserBankCard;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface SysUserBankCardDao extends BaseDAO<Long, SysUserBankCard> {
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CashAccountDetail.java

@@ -0,0 +1,15 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.common.page.QueryInfo;
+
+public class CashAccountDetail extends QueryInfo {
+    private Integer userId;
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentVipGroupShowListDto.java

@@ -41,6 +41,17 @@ public class StudentVipGroupShowListDto {
     @ApiModelProperty(value = "教师名称",required = false)
     private String teacherName;
 
+    @ApiModelProperty(value = "教师头像",required = false)
+    private String avatar;
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
     public Long getVipGroupId() {
         return vipGroupId;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/WithdrawDto.java

@@ -0,0 +1,18 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
+
+public class WithdrawDto extends QueryInfo {
+
+    @ApiModelProperty(value = "最新课次",required = false)
+    private Integer userId;
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ClassGroup.java

@@ -63,6 +63,17 @@ public class ClassGroup {
 	@ApiModelProperty(value = "总统课次",required = false)
 	private Integer totalClassTimes;
 
+	@ApiModelProperty(value = "当前课次",required = false)
+	private Integer currentClassTimes;
+
+	public Integer getCurrentClassTimes() {
+		return currentClassTimes;
+	}
+
+	public void setCurrentClassTimes(Integer currentClassTimes) {
+		this.currentClassTimes = currentClassTimes;
+	}
+
 	public Integer getTotalClassTimes() {
 		return totalClassTimes;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/School.java

@@ -52,8 +52,10 @@ public class School {
 	@ApiModelProperty(value = "补贴", required = false)
 	private BigDecimal subsidy;
 	
+	@ApiModelProperty(value = "合作单位编号", required = false)
 	private Integer cooperationOrganId;
 	
+	@ApiModelProperty(value = "备注", required = false)
 	private String remark;
 
 	public void setId(Integer id) {

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysUserBankCard.java

@@ -0,0 +1,195 @@
+package com.ym.mec.biz.dal.entity;
+
+import com.ym.mec.biz.dal.enums.BankCardStatusEnum;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(sys_user_bank_card):
+ */
+public class SysUserBankCard {
+
+	/**  */
+	private Long id;
+	
+	/** 会员标识 */
+	@ApiModelProperty(value = "会员标识",required = false)
+	private Integer userId;
+	
+	/** 是否默认 0,否;1,是 */
+	@ApiModelProperty(value = "是否默认 0,否;1,是",required = false)
+	private YesOrNoEnum isDefault;
+	
+	/** 银行名称 */
+	@ApiModelProperty(value = "银行名称",required = false)
+	private String bankName;
+	
+	/** 银行代码 */
+	@ApiModelProperty(value = "银行代码",required = false)
+	private String bankCode;
+	
+	/** 银行卡号 */
+	@ApiModelProperty(value = "银行卡号",required = false)
+	private String cardNo;
+	
+	/** 省 */
+	@ApiModelProperty(value = "省",required = false)
+	private String province;
+	
+	/** 城市 */
+	@ApiModelProperty(value = "城市",required = false)
+	private String city;
+	
+	/** 地址 */
+	@ApiModelProperty(value = "地址",required = false)
+	private String address;
+	
+	/** 0,已删除;1,正常;2,冻结;3,验证中 */
+	@ApiModelProperty(value = "联系方式",required = false)
+	private BankCardStatusEnum status;
+	
+	/** 创建时间 */
+	private java.util.Date createOn;
+	
+	/** 修改时间 */
+	private java.util.Date modifyOn;
+	
+	/** 是否是快捷卡（0，否 1，是） */
+	@ApiModelProperty(value = "是否是快捷卡",required = false)
+	private YesOrNoEnum isQuick;
+	
+	/** 银行卡绑定的手机号码 */
+	@ApiModelProperty(value = "银行卡绑定的手机号码",required = false)
+	private String mobilePhone;
+	
+	/**  */
+	@ApiModelProperty(value = "联系方式",required = false)
+	private String transNo;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setUserId(Integer userId){
+		this.userId = userId;
+	}
+	
+	public Integer getUserId(){
+		return this.userId;
+	}
+			
+	public void setBankName(String bankName){
+		this.bankName = bankName;
+	}
+	
+	public String getBankName(){
+		return this.bankName;
+	}
+			
+	public void setBankCode(String bankCode){
+		this.bankCode = bankCode;
+	}
+	
+	public String getBankCode(){
+		return this.bankCode;
+	}
+			
+	public void setCardNo(String cardNo){
+		this.cardNo = cardNo;
+	}
+	
+	public String getCardNo(){
+		return this.cardNo;
+	}
+			
+	public void setProvince(String province){
+		this.province = province;
+	}
+	
+	public String getProvince(){
+		return this.province;
+	}
+			
+	public void setCity(String city){
+		this.city = city;
+	}
+	
+	public String getCity(){
+		return this.city;
+	}
+			
+	public void setAddress(String address){
+		this.address = address;
+	}
+	
+	public String getAddress(){
+		return this.address;
+	}
+			
+	public void setCreateOn(java.util.Date createOn){
+		this.createOn = createOn;
+	}
+	
+	public java.util.Date getCreateOn(){
+		return this.createOn;
+	}
+			
+	public void setModifyOn(java.util.Date modifyOn){
+		this.modifyOn = modifyOn;
+	}
+	
+	public java.util.Date getModifyOn(){
+		return this.modifyOn;
+	}
+			
+	public void setMobilePhone(String mobilePhone){
+		this.mobilePhone = mobilePhone;
+	}
+	
+	public String getMobilePhone(){
+		return this.mobilePhone;
+	}
+			
+	public void setTransNo(String transNo){
+		this.transNo = transNo;
+	}
+	
+	public String getTransNo(){
+		return this.transNo;
+	}
+
+	public YesOrNoEnum getIsDefault() {
+		return isDefault;
+	}
+
+	public void setIsDefault(YesOrNoEnum isDefault) {
+		this.isDefault = isDefault;
+	}
+
+	public BankCardStatusEnum getStatus() {
+		return status;
+	}
+
+	public void setStatus(BankCardStatusEnum status) {
+		this.status = status;
+	}
+
+	public YesOrNoEnum getIsQuick() {
+		return isQuick;
+	}
+
+	public void setIsQuick(YesOrNoEnum isQuick) {
+		this.isQuick = isQuick;
+	}
+
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/BankCardStatusEnum.java

@@ -0,0 +1,36 @@
+package com.ym.mec.biz.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+/**
+ * 0,已删除;1,正常;2,冻结;3,验证中
+ */
+public enum BankCardStatusEnum implements BaseEnum<Integer, BankCardStatusEnum> {
+	DEL(0, "已删除"), SUCCESS(1, "正常"), FREEZE(2, "冻结"), WAIT_AUTH(3, "待验证");
+
+	private Integer code;
+
+	private String msg;
+
+	BankCardStatusEnum(Integer code, String msg) {
+		this.code = code;
+		this.msg = msg;
+	}
+
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	@Override
+	public Integer getCode() {
+		return this.code;
+	}
+}

mec-biz/src/main/java/com/ym/mec/biz/service/SysUserBankCardService.java

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.SysUserBankCard;
+import com.ym.mec.common.service.BaseService;
+
+public interface SysUserBankCardService extends BaseService<Long, SysUserBankCard> {
+
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysUserBankCardServiceImpl.java

@@ -0,0 +1,22 @@
+package com.ym.mec.biz.service.impl;
+
+import com.ym.mec.biz.dal.dao.SysUserBankCardDao;
+import com.ym.mec.biz.dal.entity.SysUserBankCard;
+import com.ym.mec.biz.service.SysUserBankCardService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SysUserBankCardServiceImpl extends BaseServiceImpl<Long, SysUserBankCard> implements SysUserBankCardService {
+	
+	@Autowired
+	private SysUserBankCardDao sysUserBankCardDao;
+
+	@Override
+	public BaseDAO<Long, SysUserBankCard> getDAO() {
+		return sysUserBankCardDao;
+	}
+	
+}

mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -51,6 +51,7 @@
             <if test="type!=null">type_,</if>
             <if test="expectStudentNum!=null">expect_student_num_,</if>
             <if test="totalClassTimes!=null">total_class_times_,</if>
+            <if test="currentClassTimes!=null">current_class_times_,</if>
         </trim>
         VALUES
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -64,6 +65,7 @@
             <if test="type!=null">#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},</if>
             <if test="expectStudentNum!=null">#{expectStudentNum},</if>
             <if test="totalClassTimes!=null">#{totalClassTimes},</if>
+            <if test="currentClassTimes!=null">#{currentClassTimes},</if>
         </trim>
     </insert>
 
@@ -107,6 +109,9 @@
             <if test="totalClassTimes != null">
                 total_class_times_ = #{totalClassTimes},
             </if>
+            <if test="currentClassTimes!=null">
+                current_class_times_=#{currentClassTimes},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

mec-biz/src/main/resources/config/mybatis/StudentWithdrawMapper.xml

@@ -89,12 +89,23 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="StudentWithdraw" parameterType="map">
-        SELECT * FROM student_withdraw ORDER BY id_
+        SELECT * FROM student_withdraw
+        <where>
+            <if test="userId != null">
+                user_id_ = #{userId}
+            </if>
+        </where>
+        ORDER BY id_
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM student_withdraw
+        <where>
+            <if test="userId != null">
+                user_id_ = #{userId}
+            </if>
+        </where>
 	</select>
 </mapper>

mec-biz/src/main/resources/config/mybatis/SysUserBankCardMapper.xml

@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.ym.mec.biz.dal.dao.SysUserBankCardDao">
+
+    <resultMap type="com.ym.mec.biz.dal.entity.SysUserBankCard" id="SysUserBankCard">
+        <result column="id_" property="id"/>
+        <result column="user_id_" property="userId"/>
+        <result column="is_default_" property="isDefault" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="bank_name_" property="bankName"/>
+        <result column="bank_code_" property="bankCode"/>
+        <result column="card_no_" property="cardNo"/>
+        <result column="province_" property="province"/>
+        <result column="city_" property="city"/>
+        <result column="address" property="address"/>
+        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="create_on_" property="createOn"/>
+        <result column="modify_on_" property="modifyOn"/>
+        <result column="is_quick_" property="isQuick" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="mobile_phone_" property="mobilePhone"/>
+        <result column="trans_no_" property="transNo"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="SysUserBankCard">
+		SELECT * FROM sys_user_bank_card WHERE id_ = #{id} 
+	</select>
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="SysUserBankCard">
+		SELECT * FROM sys_user_bank_card ORDER BY id_
+	</select>
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysUserBankCard" useGeneratedKeys="true" keyColumn="id"
+            keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO sys_user_bank_card
+        (id_,user_id_,is_default_,bank_name_,bank_code_,card_no_,province_,city_,address,create_on_,modify_on_,is_quick_,mobile_phone_,trans_no_)
+        VALUES(#{id},#{userId},#{isDefault,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{bankName},#{bankCode},#{cardNo},#{province},#{city},#{address},now(),now(),#{isQuick,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{mobilePhone},#{transNo})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.biz.dal.entity.SysUserBankCard">
+        UPDATE sys_user_bank_card
+        <set>
+            <if test="mobilePhone != null">
+                mobile_phone_ = #{mobilePhone},
+            </if>
+            <if test="status != null">
+                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="modifyOn != null">
+                modify_on_ = #{modifyOn},
+            </if>
+            <if test="address != null">
+                address = #{address},
+            </if>
+            <if test="isDefault != null">
+                is_default_ = #{isDefault,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="bankCode != null">
+                bank_code_ = #{bankCode},
+            </if>
+            <if test="cardNo != null">
+                card_no_ = #{cardNo},
+            </if>
+            <if test="bankName != null">
+                bank_name_ = #{bankName},
+            </if>
+            <if test="province != null">
+                province_ = #{province},
+            </if>
+            <if test="city != null">
+                city_ = #{city},
+            </if>
+            <if test="userId != null">
+                user_id_ = #{userId},
+            </if>
+            <if test="isQuick != null">
+                is_quick_ = #{isQuick,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="transNo != null">
+                trans_no_ = #{transNo},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <update id="delete">
+		UPDATE sys_user_bank_card SET del_flag_ = 1 WHERE id_ = #{id}
+	</update>
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="SysUserBankCard" parameterType="map">
+        SELECT * FROM sys_user_bank_card ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM sys_user_bank_card
+	</select>
+</mapper>

mec-biz/src/main/resources/config/mybatis/SysUserCashAccountDetailMapper.xml

@@ -85,12 +85,15 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="SysUserCashAccountDetail" parameterType="map">
-        SELECT * FROM sys_user_cash_account_detail ORDER BY id_
+        SELECT * FROM sys_user_cash_account_detail
+        WHERE user_id_ = #{userId}
+        ORDER BY id_
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM sys_user_cash_account_detail
+		WHERE user_id_ = #{userId}
 	</select>
 </mapper>

mec-biz/src/main/resources/config/mybatis/VipGroupMapper.xml

@@ -35,7 +35,7 @@
     </resultMap>
 
     <resultMap id="studentVipGroupDetailDto" type="com.ym.mec.biz.dal.dto.StudentVipGroupDetailDto" extends="studentVipGroup">
-        <collection property="students" resultMap="com.ym.mec.biz.dal.dao.CourseScheduleDao.CourseSchedule" column="user_id_"/>
+        <collection property="courseSchedules" resultMap="com.ym.mec.biz.dal.dao.CourseScheduleDao.CourseSchedule" column="user_id_"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.dto.StudentVipGroupShowListDto" id="studentVipGroup">
@@ -49,6 +49,7 @@
         <result column="expect_student_num_" property="expectStudentNum"/>
         <result column="student_num_" property="studentNum"/>
         <result column="teacher_name_" property="teacherName"/>
+        <result column="avatar_" property="avatar"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -156,7 +157,8 @@
             vg.offline_classes_num_,
             cg.expect_student_num_,
             cg.student_num_,
-            su.username_ teacher_name_
+            su.username_ teacher_name_,
+            su.avatar_
         FROM
             vip_group vg
             LEFT JOIN vip_group_class_group_mapper vgcgm ON vg.id_=vgcgm.vip_group_id_

mec-common/common-core/src/main/java/com/ym/mec/common/config/FeignConfiguration.java

@@ -17,6 +17,9 @@ public class FeignConfiguration implements RequestInterceptor {
 	@Override
 	public void apply(RequestTemplate template) {
 		ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+		if (attributes == null) {
+			return;
+		}
 		HttpServletRequest request = attributes.getRequest();
 		Enumeration<String> headerNames = request.getHeaderNames();
 		if (headerNames != null) {

mec-education/src/main/resources/application.yml

@@ -72,4 +72,8 @@ management:
         include: "*"
   endpoint:
     health:
-      show-details: ALWAYS
+      show-details: ALWAYS
+  
+feign:
+  hystrix:
+    enabled: true

mec-student/src/main/java/com/ym/mec/student/controller/StudentVipGroupController.java

@@ -23,13 +23,13 @@ public class StudentVipGroupController extends BaseController {
     private VipGroupService vipGroupService;
 
     @ApiOperation("获取vip课列表")
-    @PostMapping("/queryVipGroups")
-    public Object queryVipGroups(@RequestBody QueryInfo queryInfo){
+    @GetMapping(value = "/queryVipGroups")
+    public Object queryVipGroups(QueryInfo queryInfo){
         return succeed(vipGroupService.findStudentVipGroupList(queryInfo));
     }
 
     @ApiOperation("获取学生端vip课显示详情")
-    @PostMapping("/getVipGroupShowDetail/{vipGroupId}")
+    @GetMapping(value = "/getVipGroupShowDetail/{vipGroupId}")
     public Object getVipGroupShowDetail(@PathVariable("vipGroupId") Long vipGroupId){
         return succeed(vipGroupService.getVipGroupShowDetail(vipGroupId));
     }

mec-student/src/main/resources/application.yml

@@ -72,4 +72,8 @@ management:
         include: "*"
   endpoint:
     health:
-      show-details: ALWAYS
+      show-details: ALWAYS
+  
+feign:
+  hystrix:
+    enabled: true

mec-task/src/main/resources/application.yml

@@ -50,4 +50,8 @@ security:
       token-info-uri: http://localhost:8001/oauth/check_token
       
 swagger:
-  base-package: com.ym.mec.task.controller
+  base-package: com.ym.mec.task.controller
+  
+feign:
+  hystrix:
+    enabled: true

mec-teacher/src/main/resources/application.yml

@@ -72,4 +72,8 @@ management:
         include: "*"
   endpoint:
     health:
-      show-details: ALWAYS
+      show-details: ALWAYS
+  
+feign:
+  hystrix:
+    enabled: true

mec-web/src/main/java/com/ym/mec/web/controller/CooperationOrganController.java

@@ -1,25 +1,16 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.common.security.AuthUser;
-import com.ym.mec.common.security.SecurityUtils;
+import com.ym.mec.biz.dal.entity.CooperationOrgan;
+import com.ym.mec.biz.service.CooperationOrganService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-
-import java.util.Date;
-
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
-import com.ym.mec.biz.dal.entity.CooperationOrgan;
-import com.ym.mec.biz.service.CooperationOrganService;
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.page.QueryInfo;
+import java.util.Date;
 
 @RequestMapping("cooperationOrgan")
 @Api(tags = "合作单位(教学点)服务")

mec-web/src/main/java/com/ym/mec/web/controller/StudentWithdrawController.java

@@ -0,0 +1,38 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.biz.dal.dto.WithdrawDto;
+import com.ym.mec.biz.dal.entity.CooperationOrgan;
+import com.ym.mec.biz.dal.entity.StudentWithdraw;
+import com.ym.mec.biz.service.CooperationOrganService;
+import com.ym.mec.biz.service.StudentWithdrawService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.QueryInfo;
+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.*;
+
+import java.util.Date;
+
+@RequestMapping("cooperationOrgan")
+@Api(tags = "提现服务")
+@RestController
+public class StudentWithdrawController extends BaseController {
+
+    @Autowired
+    private StudentWithdrawService studentWithdrawService;
+
+    @ApiOperation(value = "新增")
+    @PostMapping("/add")
+    public Object add(StudentWithdraw studentWithdraw) {
+        studentWithdrawService.insert(studentWithdraw);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPage")
+    public Object queryPage(WithdrawDto queryInfo) {
+        return succeed(studentWithdrawService.queryPage(queryInfo));
+    }
+}

mec-web/src/main/java/com/ym/mec/web/controller/SysUserBankCardController.java

@@ -0,0 +1,50 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.biz.dal.entity.SysUserBankCard;
+import com.ym.mec.biz.service.SysUserBankCardService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.QueryInfo;
+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.*;
+
+import java.util.Date;
+
+@RequestMapping("userBankCard")
+@Api(tags = "银行卡信息服务")
+@RestController
+public class SysUserBankCardController extends BaseController {
+
+    @Autowired
+    private SysUserBankCardService sysUserBankCardService;
+
+    @ApiOperation(value = "新增银行卡信息")
+    @PostMapping("/add")
+    public Object add(SysUserBankCard sysUserBankCard) {
+        sysUserBankCardService.insert(sysUserBankCard);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除银行卡信息")
+    @PostMapping("/del/{id}")
+    public Object del(@ApiParam(value = "银行卡信息编号", required = true) @PathVariable("id") Long id) {
+        sysUserBankCardService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改银行卡信息")
+    @PutMapping("/update")
+    public Object update(SysUserBankCard sysUserBankCard) {
+        sysUserBankCard.setModifyOn(new Date());
+        sysUserBankCardService.update(sysUserBankCard);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询银行卡信息列表")
+    @GetMapping("/queryPage")
+    public Object queryPage(QueryInfo queryInfo) {
+        return succeed(sysUserBankCardService.queryPage(queryInfo));
+    }
+}

mec-web/src/main/java/com/ym/mec/web/controller/SysUserCashAccountController.java

@@ -0,0 +1,65 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.biz.dal.entity.ChargeType;
+import com.ym.mec.biz.dal.entity.SysUserCashAccount;
+import com.ym.mec.biz.service.ChargeTypeService;
+import com.ym.mec.biz.service.SysUserCashAccountService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.QueryInfo;
+import com.ym.mec.common.security.AuthUser;
+import com.ym.mec.common.security.SecurityUtils;
+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.*;
+
+import java.util.Date;
+
+@RequestMapping("userCashAccount")
+@Api(tags = "用户账户服务")
+@RestController
+public class SysUserCashAccountController extends BaseController {
+
+    @Autowired
+    private SysUserCashAccountService sysUserCashAccountService;
+
+//    @ApiOperation(value = "新增用户账户")
+//    @PostMapping("/add")
+//    public Object add(SysUserCashAccount sysUserCashAccount) {
+//        sysUserCashAccountService.insert(sysUserCashAccount);
+//        return succeed();
+//    }
+
+    @ApiOperation(value = "获取用户账户信息")
+    @GetMapping("/get")
+    public Object add() {
+        AuthUser user = SecurityUtils.getUser();
+        if(user == null){
+            return failed("请重新登录");
+        }
+        return succeed(sysUserCashAccountService.get(user.getUserId()));
+    }
+
+//    @ApiOperation(value = "删除收费类型")
+//    @PostMapping("/del/{id}")
+//    public Object del(@ApiParam(value = "收费类型编号", required = true) @PathVariable("id") Integer id) {
+//        sysUserCashAccountService.delete(id);
+//        return succeed();
+//    }
+//
+//    @ApiOperation(value = "修改收费类型")
+//    @PostMapping("/update")
+//    public Object update(SysUserCashAccount sysUserCashAccount) {
+//        sysUserCashAccount.setUpdateTime(new Date());
+//        sysUserCashAccountService.update(sysUserCashAccount);
+//        return succeed();
+//    }
+
+    @ApiOperation(value = "分页查询收费类型列表")
+    @GetMapping("/queryPage")
+    public Object queryPage(QueryInfo queryInfo) {
+        return succeed(sysUserCashAccountService.queryPage(queryInfo));
+    }
+
+}

mec-web/src/main/java/com/ym/mec/web/controller/SysUserCashAccountDetailController.java

@@ -0,0 +1,55 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dto.CashAccountDetail;
+import com.ym.mec.biz.dal.entity.SysUserCashAccount;
+import com.ym.mec.biz.dal.entity.SysUserCashAccountDetail;
+import com.ym.mec.biz.service.SysUserCashAccountDetailService;
+import com.ym.mec.biz.service.SysUserCashAccountService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.QueryInfo;
+import com.ym.mec.common.security.AuthUser;
+import com.ym.mec.common.security.SecurityUtils;
+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.*;
+
+import java.util.Date;
+
+@RequestMapping("userCashAccountDetail")
+@Api(tags = "用户交易明细服务")
+@RestController
+public class SysUserCashAccountDetailController extends BaseController {
+
+    @Autowired
+    private SysUserCashAccountDetailService sysUserCashAccountDetailService;
+
+    @ApiOperation(value = "新增用户交易明细")
+    @PostMapping("/add")
+    public Object add(SysUserCashAccountDetail sysUserCashAccountDetail) {
+        sysUserCashAccountDetailService.insert(sysUserCashAccountDetail);
+        return succeed();
+    }
+
+//    @ApiOperation(value = "修改用户交易明细")
+//    @PostMapping("/update")
+//    public Object update(SysUserCashAccountDetail sysUserCashAccountDetail) {
+//        sysUserCashAccountDetail.setUpdateTime(new Date());
+//        sysUserCashAccountDetailService.update(sysUserCashAccountDetail);
+//        return succeed();
+//    }
+
+    @ApiOperation(value = "分页查询用户交易明细")
+    @GetMapping("/queryPage")
+    public Object queryPage(CashAccountDetail queryInfo) {
+        AuthUser user = SecurityUtils.getUser();
+        if(user == null){
+            return failed("请重新登录");
+        }
+        queryInfo.setUserId(user.getUserId());
+        return succeed(sysUserCashAccountDetailService.queryPage(queryInfo));
+    }
+
+}

mec-web/src/main/resources/application.yml

@@ -72,4 +72,8 @@ management:
         include: "*"
   endpoint:
     health:
-      show-details: ALWAYS
+      show-details: ALWAYS
+  
+feign:
+  hystrix:
+    enabled: true