소스 검색

1、课堂作业提交联动服务指标限制;
2、vip课创建无运营主管提示;
3、vip课购买添加学员限制;

Joburgess 5 년 전
부모
커밋
0b27d9e603

+ 1 - 1
codegen/src/main/java/com/yonge/crud/CodegenApplication.java

@@ -28,7 +28,7 @@ public class CodegenApplication {
 		 */
 
 		// "src/generateConfigration.xml"
-		GenerateConfiguration genConfig = toObject("src/main/resources/generateConfigration.xml", GenerateConfiguration.class);
+		GenerateConfiguration genConfig = toObject("codegen/src/main/resources/generateConfigration.xml", GenerateConfiguration.class);
 
 		Configuration config = genConfig.getDbConfiguration();
 

+ 1 - 1
codegen/src/main/resources/generateConfigration.xml

@@ -4,7 +4,7 @@
 		<driverClass>com.mysql.jdbc.Driver</driverClass>
 		<url>jdbc:mysql://47.99.212.176:3306/edu_saas</url>
 		<username>edu_saas</username>
-		<password>edu_saas</password>
+		<password>dayaDataOnline@2019</password>
 		<catalog>edu_saas</catalog>
 		<schema>edu_saas</schema>
 	</dbConfiguration>

+ 3 - 0
mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -615,8 +615,11 @@
     <select id="countGroupOrderWithoutFailed" resultType="int">
         SELECT COUNT(*)
         FROM student_payment_order spo
+        LEFT JOIN class_group_student_mapper cgsm ON spo.music_group_id_=cgsm.music_group_id_
         WHERE spo.music_group_id_ = #{groupId}
         AND spo.status_ != 'FAILED'
+        AND cgsm.status_!= 'QUIT'
         AND spo.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler }
+        AND cgsm.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler }
     </select>
 </mapper>