update

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentRegistrationQueryInfo.java

@@ -19,6 +19,28 @@ public class StudentRegistrationQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "实际专业编号",required = false)
     private Integer actualSubjectId;
 
+    @ApiModelProperty(value = "学员缴费状态",required = false)
+    private YesOrNoEnum paymentStatus;
+
+    @ApiModelProperty(value = "用户名或手机号",required = false)
+    private String name;
+
+    public YesOrNoEnum getPaymentStatus() {
+        return paymentStatus;
+    }
+
+    public void setPaymentStatus(YesOrNoEnum paymentStatus) {
+        this.paymentStatus = paymentStatus;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public Integer getActualSubjectId() {
         return actualSubjectId;
     }

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

@@ -45,6 +45,9 @@ public class DemoGroupServiceImpl extends BaseServiceImpl<Long, DemoGroup>  impl
 
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
+	@Autowired
+	private SubjectDao subjectDao;
+
 
 	@Override
 	public BaseDAO<Long, DemoGroup> getDAO() {
@@ -134,7 +137,7 @@ public class DemoGroupServiceImpl extends BaseServiceImpl<Long, DemoGroup>  impl
 				demoGroupCoursesPlan.getCoursesStartTime(),
 				classGroup.getId().longValue());
 		String[] classSubjects = courseScheduleDao.findClassSubjects(Arrays.asList(new Integer[]{classGroup.getId()}));
-		StringBuilder className=new StringBuilder(classSubjects[0].split("-")[1]);
+		StringBuilder className=new StringBuilder(subjectDao.get(demoGroup.getSubjectId().intValue()).getName());
 		className.append("-");
 		className.append(CourseSchedule.CourseScheduleType.DEMO.getMsg());
 		courseScheduleDao.batchAddCourseSchedules(courseScheduleByDemoGroup);

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

@@ -135,8 +135,9 @@
 	</select>
 
     <select id="findGoodsBySubId" resultMap="Goods">
-        SELECT g.* FROM subject_goods_mapper sgm LEFT JOIN goods g ON sgm.goods_id_ = g.id_
-        WHERE sgm.subject_id_ =  #{subjectId} AND g.goods_category_id_ = #{goodsCategoryId}
+        SELECT g.* FROM subject_goods_mapper sgm
+        LEFT JOIN goods g ON sgm.goods_category_id_ = g.goods_category_id_
+        WHERE sgm.subject_id_ = #{subjectId} AND sgm.type_ = #{type}
     </select>
 
     <!-- 根据 -->

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

@@ -145,16 +145,19 @@
     <sql id="queryStudentDetailPageSql">
         <where>
             <if test="musicGroupId != null">
-                sr.music_group_id_ = #{musicGroupId}
+                AND sr.music_group_id_ = #{musicGroupId}
             </if>
             <if test="subjectId != null">
-                sr.subject_id_ = #{subjectId}
+                AND sr.subject_id_ = #{subjectId}
             </if>
             <if test="isAllowAdjust != null">
-                sr.is_allow_adjust_ = #{isAllowAdjust}
+                AND sr.is_allow_adjust_ = #{isAllowAdjust}
             </if>
             <if test="actualSubjectId != null">
-                sr.actual_subject_id_ = #{actualSubjectId}
+                AND sr.actual_subject_id_ = #{actualSubjectId}
+            </if>
+            <if test="name != null">
+                AND (sr.name_ LIKE CONCAT('%',#{name},'%') OR sr.parents_phone_ LIKE CONCAT('%',#{name},'%'))
             </if>
         </where>
     </sql>
@@ -169,11 +172,12 @@
         <result column="subject_name_" property="subjectName"/>
         <result column="username_" property="studentName"/>
         <result column="actual_subject_name_" property="actualSubjectName"/>
+        <result column="payment_status_" property="paymentStatus"/>
         <result column="gender_" property="gender" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
     <select id="queryStudentDetailPage" resultMap="studentApplyDetail">
-        SELECT su.username_,sr.parents_name_,sr.current_class_,sr.current_grade_,
-        su.gender_,sr.is_allow_adjust_, s.name_ subject_name_,ss.name_ actual_subject_name_,sr.parents_phone_
+        SELECT sr.name_ username_,sr.parents_name_,sr.current_class_,sr.current_grade_,
+        su.gender_,sr.is_allow_adjust_, s.name_ subject_name_,ss.name_ actual_subject_name_,sr.parents_phone_,sr.payment_status_
         FROM student_registration sr
         LEFT JOIN sys_user su ON sr.subject_id_ = su.id_
         LEFT JOIN `subject` s ON sr.subject_id_ = s.id_

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

@@ -5,14 +5,13 @@ import com.ym.mec.auth.api.entity.SysUser;
 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;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RequestMapping("userBankCard")
 @Api(tags = "银行卡信息服务")
@@ -41,8 +40,11 @@ public class SysUserBankCardController extends BaseController {
     @ApiOperation(value = "删除银行卡信息")
     @PostMapping("/del")
     public Object del(Long id) {
+        if(id == null){
+            return failed("参数校验失败");
+        }
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser != null && sysUser.getId() != null){
+        if(sysUser == null || sysUser.getId() == null){
             return failed("获取用户信息失败");
         }
         sysUserBankCardService.del(id,sysUser.getId());