Merge branch 'feature/1022_vip' of http://git.dayaedu.com/yonge/mec into test

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/MemberRankSettingWrapper.java

@@ -52,6 +52,9 @@ public class MemberRankSettingWrapper {
         @ApiModelProperty("学生ID")
         private Integer studentId;
 
+        @ApiModelProperty("是否删除")
+        private Boolean delFlag = false;
+
         public String jsonString() {
             return JSON.toJSONString(this);
         }

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

@@ -369,9 +369,9 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
         }
         //保存学员会员时间
         studentMemberTimeService.saveToCloudTeacherOrder(cloudTeacherOrder);
-        studentDao.updateCloudTeacherEndTime(cloudTeacherOrder.getStudentId());
         //保存学员会员调整日志
         studentMemberUpdateLogService.saveToCloudTeacherOrder(cloudTeacherOrder);
+        studentDao.updateCloudTeacherEndTime(cloudTeacherOrder.getStudentId());
     }
 
     public Date calcCloudTeacherOrderTime(CloudTeacherOrder cloudTeacherOrder, Date startTime) {

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

@@ -75,10 +75,12 @@
 
 	<sql id="queryPageSql">
 		<where>
-            mrs.del_flag_ = 0
 			<if test="search != null and search != ''">
 				AND (mrs.name_ LIKE CONCAT('%',#{search},'%') OR mrs.id_ = #{search})
 			</if>
+            <if test="delFlag != null and delFlag == false">
+                AND mrs.del_flag_ = 0
+            </if>
             <if test="updateStartTime !=null">
                 AND mrs.update_time_ &gt;= #{updateStartTime}
             </if>