Ver código fonte

Merge remote-tracking branch 'origin/master'

周箭河 6 anos atrás
pai
commit
d9d3aefd19

+ 4 - 1
src/main/java/com/ym/mec/collectfee/service/impl/ApplyInfoServiceImpl.java

@@ -65,6 +65,7 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 			if(applyInfo != null && applyInfo.getStatus() == 1 && applyInfo.getPushStatus() != 1){
 				//组装请求
 				applyInfo.setRealName(applyInfo.getName());
+				String gClass = applyInfo.getgClass();
 				applyInfo.setgClass(applyInfo.getGrade() + applyInfo.getgClass());
 				applyInfo.setMobile(applyInfo.getPatriarchPhone());
 				XStream xs = new XStream();
@@ -81,6 +82,7 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 					ResponseUserInfo userInfo = parseRegisterInfo(body);
 					applyInfo.setUserId(userInfo.getUserId());
 					applyInfo.setPushStatus(1);
+					applyInfo.setGClass(gClass);
 					RequestMecApplyClass applyClass = getApplyClass(applyInfo,orderId);
 					body = xs.toXML(applyClass);
 					body = body.substring(body.indexOf("<body>")+6,body.indexOf("</body>"));
@@ -90,6 +92,7 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 					applyInfoDao.update(applyInfo);
 					return true;
 				}catch (Exception e){
+					e.printStackTrace();
 					applyInfo.setPushStatus(2);
 					applyInfoDao.update(applyInfo);
 				}
@@ -113,7 +116,7 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 			//<classId>课程班(乐团)编号</classId>
 			applyClass.setClassId(applyInfo.getClassId());
 			//<subName>学员专业名称</subName>
-			CourseGroupInfo groupInfo = courseGroupInfoDao.get(applyInfo.getSubId());
+			CourseGroupInfo groupInfo = courseGroupInfoDao.get(applyInfo.getCourseId());
 			applyClass.setSubName(groupInfo.getSubName());
 			//<remark>备注</remark>
 			applyClass.setRemark(order.getRemark());

+ 32 - 3
src/main/resources/config/mybatis/ApplyInfoMapper.xml

@@ -148,7 +148,7 @@
 	<sql id="studentsPage">
 		<where>
 			<if test="musicTeamId != null">
-				ai.class_id_ = #{musicTeamId}
+				AND ai.class_id_ = #{musicTeamId}
 			</if>
 			<if test="name != null and name != ''">
 				AND ai.name_ = #{name}
@@ -185,7 +185,22 @@
 	<select id="queryUserPage" resultMap="ApplyInfoPage" parameterType="map">
 		SELECT ao.*,cgi.sub_name_ sub_name_ FROM (SELECT ai.*,o.amount amount_ FROM apply_info ai
 		LEFT JOIN `order` o ON ai.id_ = o.user_id
-		<include refid="studentsPage"/>) ao LEFT JOIN course_group_info cgi ON ao.course_id_ = cgi.id_
+		<where>
+			o.tui_fee IS NOT NULL AND o.`status` = 2
+			<if test="musicTeamId != null">
+				AND ai.class_id_ = #{musicTeamId}
+			</if>
+			<if test="name != null and name != ''">
+				AND ai.name_ = #{name}
+			</if>
+			<if test="status != null">
+				AND ai.status_ = #{status}
+			</if>
+			<if test="subId != null">
+				AND ai.sub_id_ = #{subId}
+			</if>
+		</where>
+		) ao LEFT JOIN course_group_info cgi ON ao.course_id_ = cgi.id_
 		ORDER BY ao.update_time_ DESC
 		<include refid="global.limit"/>
 	</select>
@@ -194,7 +209,21 @@
 		SELECT count(DISTINCT 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"/>
+		<where>
+			AND o.tui_fee IS NOT NULL AND o.`status` = 2
+			<if test="musicTeamId != null">
+				AND ai.class_id_ = #{musicTeamId}
+			</if>
+			<if test="name != null and name != ''">
+				AND ai.name_ = #{name}
+			</if>
+			<if test="status != null">
+				AND ai.status_ = #{status}
+			</if>
+			<if test="subId != null">
+				AND ai.sub_id_ = #{subId}
+			</if>
+		</where>
 	</select>
 
 	<select id="findByUserId" resultMap="ApplyInfo">