update

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroup.java

@@ -184,6 +184,8 @@ public class MusicGroup {
 
 	//0云教练1云教练+
 	private Integer cloudTeacherType;
+	
+	private Integer musicalInstrumentsProvideStatus;
 
 	public Integer getCloudTeacherType() {
 		return cloudTeacherType;
@@ -634,4 +636,12 @@ public class MusicGroup {
 	public void setIsShowRecordOfStudent(Boolean isShowRecordOfStudent) {
 		this.isShowRecordOfStudent = isShowRecordOfStudent;
 	}
+
+	public Integer getMusicalInstrumentsProvideStatus() {
+		return musicalInstrumentsProvideStatus;
+	}
+
+	public void setMusicalInstrumentsProvideStatus(Integer musicalInstrumentsProvideStatus) {
+		this.musicalInstrumentsProvideStatus = musicalInstrumentsProvideStatus;
+	}
 }

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

@@ -3675,6 +3675,21 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 	@Override
 	public boolean takeEffectOfinstrumentInsurance(String musicGroupId) {
 		
+		MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
+		if(musicGroup == null){
+			throw new BizException("乐团信息查询失败");
+		}
+		
+		if(musicGroup.getMusicalInstrumentsProvideStatus() != 0){
+			throw new BizException("乐器已发货，请勿重复操作");
+		}
+		
+		Date date = new Date();
+		
+		musicGroup.setMusicalInstrumentsProvideStatus(1);
+		musicGroup.setUpdateTime(date);
+		musicGroupDao.update(musicGroup);
+		
 		//查询当前乐团报名订单中购买了乐保的订单
 		List<StudentApplyInstrumentDto> maintenanceList = studentPaymentOrderDetailDao.queryByType(musicGroupId, OrderDetailTypeEnum.MAINTENANCE);
 		
@@ -3684,7 +3699,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 		
 		List<StudentInstrument> updateList = new ArrayList<StudentInstrument>();
 		
-		Date date = new Date();
 		for (StudentInstrument si : studentInstrumentList) {
 			if (si.getStatus() == 0 && si.getStartTime() == null) {
 				si.setStatus(1);

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

@@ -44,6 +44,7 @@
         <result column="course_view_type_" property="courseViewType"
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="is_show_record_of_student_" property="isShowRecordOfStudent"/>
+        <result column="musical_instruments_provide_status_" property="musicalInstrumentsProvideStatus"/>
     </resultMap>
     
     <resultMap type="com.ym.mec.biz.dal.dto.MusicGroupBasicDto" id="MusicGroupBasicDto" extends="MusicGroup">
@@ -215,6 +216,9 @@
             <if test="delFlag != null">
                 del_flag_ = #{delFlag},
             </if>
+            <if test="musicalInstrumentsProvideStatus != null">
+                musical_instruments_provide_status_ = #{musicalInstrumentsProvideStatus},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

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

@@ -365,4 +365,12 @@
         AND student_id_ = #{studentId} AND del_flag_ = 0 AND end_time_ > NOW()
     </select>
 
+    <select id="queryById" resultMap="StudentInstrument">
+        SELECT * FROM student_instrument
+        where id_ IN
+        <foreach collection="idList" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
+
 </mapper>