update

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

@@ -199,6 +199,9 @@ public class MusicGroup extends BaseEntity {
 	
 	@ApiModelProperty(value = "收费标准",required = false)
 	private BigDecimal chargeStandard;
+	
+	@ApiModelProperty(value = "是否赠送辅件",required = false)
+	private Boolean isGiveAccessories;
 
 	public Integer getHasInstrumentNum() {
 		return hasInstrumentNum;
@@ -689,4 +692,12 @@ public class MusicGroup extends BaseEntity {
 	public void setChargeStandard(BigDecimal chargeStandard) {
 		this.chargeStandard = chargeStandard;
 	}
+
+	public Boolean getIsGiveAccessories() {
+		return isGiveAccessories;
+	}
+
+	public void setIsGiveAccessories(Boolean isGiveAccessories) {
+		this.isGiveAccessories = isGiveAccessories;
+	}
 }

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

@@ -687,6 +687,16 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     }
 
     private MusicGroupApplyGoodsDto getCalenderTotalAmount(RegisterPayDto registerPayDto, MusicGroupPaymentCalender calender) {
+    	
+    	String musicGroupId = calender.getMusicGroupId();
+    	MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
+    	
+    	if(musicGroup == null){
+    		throw new BizException("乐团[{}]信息查询失败", musicGroupId);
+    	}
+    	
+    	boolean isGiveAccessories = musicGroup.getIsGiveAccessories();
+    	
         MusicGroupApplyGoodsDto goodsDto = new MusicGroupApplyGoodsDto();
         //乐器及打包辅件价格
         List<MusicGroupSubjectGoodsGroup> goodsGroups;
@@ -697,6 +707,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             for (MusicGroupSubjectGoodsGroup goodsGroup : goodsGroups) {
                 Map<String, BigDecimal> groupType = JSONObject.parseObject(goodsGroup.getKitGroupPurchaseTypeJson(), new TypeReference<Map<String, BigDecimal>>() {
                 });
+                
+                if(isGiveAccessories && registerPayDto.getBuyCloudTeacher()){
+                	if (goodsGroup.getType().equals(GoodsType.ACCESSORIES)) {
+                		continue;
+                	}
+                }
 
                 if (goodsGroup.getType().equals(GoodsType.INSTRUMENT)) {
                     String kitGroupPurchaseType = registerPayDto.getGoodsGroups().get(goodsGroup.getId());

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

@@ -47,6 +47,7 @@
         <result column="member_course_show_flag_" property="memberCourseShowFlag"/>
         <result column="homework_push_flag_" property="homeworkPushFlag"/>
         <result column="tenant_id_" property="tenantId"/>
+        <result column="is_give_accessories_" property="isGiveAccessories"/>
     </resultMap>
     
     <resultMap type="com.ym.mec.biz.dal.dto.MusicGroupBasicDto" id="MusicGroupBasicDto" extends="MusicGroup">
@@ -106,7 +107,7 @@
                  settlement_type_, cooperation_organ_id_, enlightenment_course_time_,
                  parent_meeting_time_, img_, director_user_id_, is_classroom_lessons_, memo_, expect_start_group_date_,
                  ownership_type_, repair_user_id_, del_flag_, payment_valid_start_date_, payment_valid_end_date_,
-                 payment_pattern_, course_view_type_, transaction_teacher_id_,homework_push_flag_,member_course_show_flag_,tenant_id_)
+                 payment_pattern_, course_view_type_, transaction_teacher_id_,homework_push_flag_,member_course_show_flag_,tenant_id_,is_give_accessories_)
         VALUES (#{id}, #{name}, #{organId}, #{schoolId}, #{applyExpireDate}, #{preApplyExpireDate}, #{teamTeacherId},
                 #{educationalTeacherId},
                 #{chargeTypeId}, #{courseForm}, now(), now(),
@@ -118,7 +119,7 @@
                 #{isClassroomLessons}, #{memo}, #{expectStartGroupDate},
                 #{ownershipType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{repairUserId},
                 #{delFlag}, #{paymentValidStartDate}, #{paymentValidEndDate}, #{paymentPattern},
-                #{courseViewType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{transactionTeacherId},#{homeworkPushFlag},#{memberCourseShowFlag},#{tenantId})
+                #{courseViewType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{transactionTeacherId},#{homeworkPushFlag},#{memberCourseShowFlag},#{tenantId},#{isGiveAccessories})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -230,6 +231,9 @@
             <if test="memberCourseShowFlag != null">
                 member_course_show_flag_ = #{memberCourseShowFlag},
             </if>
+            <if test="isGiveAccessories != null">
+                is_give_accessories_ = #{isGiveAccessories},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

mec-common/common-core/src/main/java/com/ym/mec/common/service/impl/BaseServiceImpl.java

@@ -82,7 +82,11 @@ public abstract class BaseServiceImpl<PK extends Serializable, T> implements Bas
 	 */
 	public List<T> findAll(Map<String, Object> params) {
 		
-		params.put("tenantId", TenantContextHolder.getTenantId());
+		final String TENANT_ID = "tenantId";
+		
+		if(!params.containsKey(TENANT_ID)){
+			params.put(TENANT_ID, TenantContextHolder.getTenantId());
+		}
 		return this.getDAO().findAll(params);
 	}