update

src/main/java/com/ym/mec/collectfee/controller/UserController.java

@@ -23,6 +23,8 @@ 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;
+
 @RestController()
 @RequestMapping("user")
 @Api("用户服务")
@@ -65,7 +67,11 @@ public class UserController extends BaseController {
     @PostMapping("/userApply")
     public Object userApply(ApplyInfo applyInfo){
         if(applyInfo != null){
-            return succeed(applyInfoService.insert(applyInfo));
+            Date date = new Date();
+            applyInfo.setCreateTime(date);
+            applyInfo.setUpdateTime(date);
+            applyInfoService.insert(applyInfo);
+            return succeed(applyInfo.getId());
         }
         return failed();
     }
@@ -123,7 +129,7 @@ public class UserController extends BaseController {
     @ApiOperation(value = "根据乐团编号，获取学员列表")
     @PostMapping("/getMusicTeamStu")
     public Object getMusicTeamStu(StudentsQueryInfo queryInfo){
-        return succeed(applyInfoService.queryPage(queryInfo));
+        return succeed(applyInfoService.queryUserPage(queryInfo));
     }
 
     @ApiOperation(value = "获取所有分部列表")
@@ -147,4 +153,29 @@ public class UserController extends BaseController {
         applyInfoService.saveSeminary();
         return succeed();
     }
+
+    /**
+     * 修改乐团信息
+     * @return
+     */
+    @ApiOperation(value = "修改乐团信息")
+    @PostMapping("/updateClass")
+    public Object updateClass(School school){
+        school.setUpdateTime(new Date());
+        schoolService.update(school);
+        return succeed();
+    }
+
+
+    /**
+     * 修改学生信息
+     * @return
+     */
+    @ApiOperation(value = "修改学生信息")
+    @PostMapping("/updateUser")
+    public Object updateUser(ApplyInfo applyInfo){
+        applyInfo.setUpdateTime(new Date());
+        applyInfoService.update(applyInfo);
+        return succeed();
+    }
 }

src/main/java/com/ym/mec/collectfee/dao/ApplyInfoDao.java

@@ -2,10 +2,13 @@ package com.ym.mec.collectfee.dao;
 
 import com.ym.mec.collectfee.common.dao.BaseDAO;
 import com.ym.mec.collectfee.entity.ApplyInfo;
+import com.ym.mec.collectfee.entity.ApplyInfoPage;
 import com.ym.mec.collectfee.entity.ResponseUserInfo;
+import com.ym.mec.collectfee.entity.StudentsQueryInfo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
 import java.util.Map;
 
 @Component
@@ -25,4 +28,8 @@ public interface ApplyInfoDao extends BaseDAO<Integer, ApplyInfo> {
      * @return
      */
     Map<String,Object> getUserRegisterVIewDetail(Integer stuId);
+
+    List<ApplyInfoPage> queryUserPage(Map<String, Object> queryInfo);
+
+    int queryUserCount(Map<String, Object> params);
 }

src/main/java/com/ym/mec/collectfee/entity/ApplyInfoPage.java

@@ -0,0 +1,26 @@
+package com.ym.mec.collectfee.entity;
+
+import java.math.BigDecimal;
+
+public class ApplyInfoPage extends ApplyInfo {
+
+    private BigDecimal amount;
+
+    private String subName;
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public String getSubName() {
+        return subName;
+    }
+
+    public void setSubName(String subName) {
+        this.subName = subName;
+    }
+}

src/main/java/com/ym/mec/collectfee/service/ApplyInfoService.java

@@ -3,6 +3,8 @@ package com.ym.mec.collectfee.service;
 import com.ym.mec.collectfee.common.service.BaseService;
 import com.ym.mec.collectfee.entity.ApplyInfo;
 import com.ym.mec.collectfee.entity.Branch;
+import com.ym.mec.collectfee.entity.StudentsQueryInfo;
+
 import java.util.List;
 
 public interface ApplyInfoService extends BaseService<Integer, ApplyInfo> {
@@ -17,7 +19,7 @@ public interface ApplyInfoService extends BaseService<Integer, ApplyInfo> {
      * 用户缴费成功后，到mec注册
      * @param phone
      */
-    Object userRegister(String phone);
+    Boolean userRegister(String phone);
 
     /**
      * 推送mec  3.2.13添加乐团学员（含缴费）（125218）
@@ -43,4 +45,6 @@ public interface ApplyInfoService extends BaseService<Integer, ApplyInfo> {
      * @return
      */
     Object getUserRegisterViewDetail(Integer stuId);
+
+    Object queryUserPage(StudentsQueryInfo queryInfo);
 }

src/main/java/com/ym/mec/collectfee/service/impl/ApplyInfoServiceImpl.java

@@ -2,11 +2,13 @@ package com.ym.mec.collectfee.service.impl;
 
 import com.thoughtworks.xstream.XStream;
 import com.ym.mec.collectfee.common.dao.BaseDAO;
+import com.ym.mec.collectfee.common.page.PageInfo;
 import com.ym.mec.collectfee.common.service.impl.BaseServiceImpl;
 import com.ym.mec.collectfee.dao.*;
 import com.ym.mec.collectfee.entity.*;
 import com.ym.mec.collectfee.service.ApplyInfoService;
 import com.ym.mec.collectfee.utils.HttpUtil;
+import com.ym.mec.collectfee.utils.MapUtil;
 import com.ym.mec.collectfee.utils.XStreamUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,7 +49,7 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 	}
 
 	@Override
-	public Object userRegister(String phone) {
+	public Boolean userRegister(String phone) {
 		try {
 			ApplyInfo applyInfo = applyInfoDao.findUserByPhone(phone,null);
 			if(applyInfo != null && applyInfo.getStatus() == 1 && applyInfo.getPushStatus() != 1){
@@ -73,16 +75,18 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 					body = body.substring(body.indexOf("<body>")+6,body.indexOf("</body>"));
 					//推送mec用户缴费
 					getBody(body,125218);
+					applyInfoDao.update(applyInfo);
+					return true;
 				}catch (Exception e){
 					applyInfo.setPushStatus(2);
+					applyInfoDao.update(applyInfo);
 				}
-				applyInfoDao.update(applyInfo);
-				return body;
+				return false;
 			}
 		}catch (Exception e){
 			e.printStackTrace();
 		}
-		return null;
+		return false;
 	}
 
 	@Override
@@ -201,6 +205,26 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 		return vIewDetail;
 	}
 
+	@Override
+	public Object queryUserPage(StudentsQueryInfo queryInfo) {
+		PageInfo<ApplyInfoPage> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+		Map<String, Object> params = new HashMap<>();
+		MapUtil.populateMap(params, queryInfo);
+
+		List<ApplyInfoPage> dataList = null;
+		int count = applyInfoDao.queryUserCount(params);
+		if (count > 0) {
+			pageInfo.setTotal(count);
+			params.put("offset", pageInfo.getOffset());
+			dataList = applyInfoDao.queryUserPage(params);
+		}
+		if (count == 0) {
+			dataList = new ArrayList<>();
+		}
+		pageInfo.setRows(dataList);
+		return pageInfo;
+	}
+
 	private ResponseUserInfo parseRegisterInfo(String body){
 		body = "<body>" + new String(Base64.getDecoder().decode(body)) + "</body>";
 		ResponseUserInfo userInfo = XStreamUtil.xmlToObject("body", ResponseUserInfo.class, body);

src/main/resources/config/mybatis/ApplyInfoMapper.xml

@@ -29,6 +29,32 @@
 		<result column="update_time_" property="updateTime" />
 		<result column="create_time_" property="createTime" />
 	</resultMap>
+
+	<resultMap type="com.ym.mec.collectfee.entity.ApplyInfoPage" id="ApplyInfoPage">
+		<result column="id_" property="id" />
+		<result column="user_id_" property="userId" />
+		<result column="name_" property="name" />
+		<result column="sex_" property="sex" />
+		<result column="birthday_" property="birthday" />
+		<result column="city_" property="city" />
+		<result column="school_" property="school" />
+		<result column="course_id_" property="courseId" />
+		<result column="class_id_" property="classId" />
+		<result column="branch_id_" property="branchId" />
+		<result column="grade_" property="grade" />
+		<result column="g_class_" property="gClass" />
+		<result column="sub_id_" property="subId" />
+		<result column="is_adjust_" property="isAdjust" />
+		<result column="patriarch_phone_" property="patriarchPhone" />
+		<result column="patriarch_name_" property="patriarchName" />
+		<result column="patriarch_unit_" property="patriarchUnit" />
+		<result column="status_" property="status" />
+		<result column="push_status_" property="pushStatus" />
+		<result column="update_time_" property="updateTime" />
+		<result column="sub_name_" property="subName" />
+		<result column="amount_" property="amount" />
+		<result column="create_time_" property="createTime" />
+	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="ApplyInfo" >
@@ -42,18 +68,13 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.collectfee.entity.ApplyInfo" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO apply_info (class_id_,user_id_,branch_id_,name_,sex_,birthday_,city_,school_,grade_,g_class_,sub_id_,is_adjust_,patriarch_phone_,patriarch_name_,patriarch_unit_,status_,update_time_,create_time_) VALUES
-		(#{classId},#{userId},#{branchId},#{name},#{sex},#{birthday},#{city},#{school},#{grade},#{gClass},#{subId},#{isAdjust},#{patriarchPhone},#{patriarchName},#{patriarchUnit},#{status},#{updateTime},#{createTime})
+		INSERT INTO apply_info (course_id_,class_id_,user_id_,branch_id_,name_,sex_,birthday_,city_,school_,grade_,g_class_,sub_id_,is_adjust_,patriarch_phone_,patriarch_name_,patriarch_unit_,update_time_,create_time_) VALUES
+		(#{courseId},#{classId},#{userId},#{branchId},#{name},#{sex},#{birthday},#{city},#{school},#{grade},#{gClass},#{subId},#{isAdjust},#{patriarchPhone},#{patriarchName},#{patriarchUnit},#{updateTime},#{createTime})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.collectfee.entity.ApplyInfo">
-		UPDATE apply_info SET class_id_ = #{classId},user_id_ = #{userId},branch_id_ = #{branchId},push_status_ = #{pushStatus},sub_id_ = #{subId},school_ = #{school},is_adjust_ = #{isAdjust},status_ = #{status},id_ = #{id},g_class_ = #{gClass},sex_ = #{sex},birthday_ = #{birthday},name_ = #{name},create_time_ = #{createTime},city_ = #{city},patriarch_phone_ = #{patriarchPhone},patriarch_name_ = #{patriarchName},patriarch_unit_ = #{patriarchUnit},update_time_ = #{updateTime},grade_ = #{grade} WHERE id_ = #{id}
+		UPDATE apply_info SET class_id_ = #{classId},user_id_ = #{userId},branch_id_ = #{branchId},push_status_ = #{pushStatus},sub_id_ = #{subId},school_ = #{school},is_adjust_ = #{isAdjust},status_ = #{status},id_ = #{id},g_class_ = #{gClass},sex_ = #{sex},birthday_ = #{birthday},name_ = #{name},city_ = #{city},patriarch_phone_ = #{patriarchPhone},patriarch_name_ = #{patriarchName},patriarch_unit_ = #{patriarchUnit},update_time_ = #{updateTime},grade_ = #{grade} WHERE id_ = #{id}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -63,19 +84,19 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="ApplyInfo" parameterType="map">
-		SELECT * FROM apply_info <include refid="studentsPage"/> ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM apply_info ai <include refid="studentsPage"/> ORDER BY id_ <include refid="global.limit"/>
 	</select>
 
 	<sql id="studentsPage">
 		<where>
 			<if test="musicTeamId != null">
-				class_id_ = #{musicTeamId}
+				ai.class_id_ = #{musicTeamId}
 			</if>
 			<if test="name != null and name != ''">
-				AND name_ = #{name}
+				AND ai.name_ = #{name}
 			</if>
 			<if test="status != null">
-				AND status_ = #{status}
+				AND ai.status_ = #{status}
 			</if>
 		</where>
 	</sql>
@@ -91,7 +112,23 @@
 			AND class_id_ = #{clazzId}
 		</if>
 	</select>
+
 	<select id="getUserRegisterVIewDetail" resultType="java.util.Map">
 		SELECT ai.*,cgi.sub_name_,cgi.plan_num_,cgi.fee_amount_,cgi.fee_type_ FROM apply_info ai LEFT JOIN course_group_info cgi ON ai.course_id_ = cgi.id_ WHERE ai.id_ = #{stuId}
 	</select>
+
+	<select id="queryUserPage" resultMap="ApplyInfoPage" parameterType="map">
+		SELECT ai.*,cgi.sub_name_ sub_name_,o.amount amount_ FROM apply_info ai
+		LEFT JOIN course_group_info cgi ON ai.sub_id_ = cgi.sub_id_
+		LEFT JOIN `order` o ON ai.id_ = o.user_id
+		<include refid="studentsPage"/>
+		<include refid="global.limit"/>
+	</select>
+
+	<select id="queryUserCount" resultType="java.lang.Integer">
+		SELECT count(ai.id_) FROM apply_info ai
+		LEFT JOIN course_group_info cgi ON ai.sub_id_ = cgi.sub_id_
+		LEFT JOIN `order` o ON ai.id_ = o.user_id
+		<include refid="studentsPage"/>
+	</select>
 </mapper>