Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupSubjectGoodsGroupDao.java

@@ -39,5 +39,5 @@ public interface MusicGroupSubjectGoodsGroupDao extends BaseDAO<Long, MusicGroup
      */
     int delByMusicGroupId(String musicGroupId);
     
-    MusicGroupSubjectGoodsGroup query(@Param("musicGroupId")String musicGroupId,@Param("subjectId")Integer subjectId);
+    MusicGroupSubjectGoodsGroup query(@Param("musicGroupId")String musicGroupId,@Param("subjectId")Integer subjectId,@Param("goodsIdList") String goodsIdList);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupSubjectGoodsGroupService.java

@@ -24,5 +24,5 @@ public interface MusicGroupSubjectGoodsGroupService extends BaseService<Long, Mu
     List<MusicGroupSubjectGoodsGroup> findGoodsGroupByIds(String ids);
 
     
-    MusicGroupSubjectGoodsGroup query(String musicGroupId,Integer subjectId);
+    MusicGroupSubjectGoodsGroup query(String musicGroupId,Integer subjectId, String goodsIdList);
 }

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

@@ -643,7 +643,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			StudentPaymentOrder studentPaymentOrder = studentPaymentOrderService.findMusicGroupApplyOrderByStatus(userId, musicGroupId, DealStatusEnum.SUCCESS);
 
 			if (studentPaymentOrder == null) {
-				MusicGroupSubjectGoodsGroup musicGroupSubjectPlan = musicGroupSubjectGoodsGroupService.query(musicGroupId, subjectId);
+				MusicGroupSubjectGoodsGroup musicGroupSubjectPlan = musicGroupSubjectGoodsGroupService.query(musicGroupId, subjectId, goodsIds);
 				if (musicGroupSubjectPlan != null) {
 					depositFee = musicGroupSubjectPlan.getDepositFee().doubleValue();
 				}
@@ -748,7 +748,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 					.findMusicGroupApplyOrderByStatus(userId, musicGroupId, DealStatusEnum.WAIT_PAY);
 
 			if (studentPaymentOrder == null) {
-				MusicGroupSubjectGoodsGroup musicGroupSubjectPlan = musicGroupSubjectGoodsGroupService.query(musicGroupId, subjectId);
+				MusicGroupSubjectGoodsGroup musicGroupSubjectPlan = musicGroupSubjectGoodsGroupService.query(musicGroupId, subjectId, goodsIds);
 				if (musicGroupSubjectPlan != null) {
 					depositFee = musicGroupSubjectPlan.getDepositFee().doubleValue();
 				}

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

@@ -398,16 +398,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 if (orderDetail == null || orderDetail.getPrice() == null || orderDetail.getGoodsIdList() == null) {
                     continue;
                 }
-                if (orderDetail.getType().equals(OrderDetailTypeEnum.MUSICAL) && musicOneSubjectClassPlan.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.FREE)) {
-                    orderDetail.setPrice(BigDecimal.ZERO);
-                }
                 MusicGroupSubjectGoodsGroup musicGroupSubjectGoodsGroup = new MusicGroupSubjectGoodsGroup();
                 GoodsType goodsType = orderDetail.getType().equals(OrderDetailTypeEnum.MUSICAL) ? GoodsType.INSTRUMENT : GoodsType.ACCESSORIES;
                 musicGroupSubjectGoodsGroup.setType(goodsType);
                 musicGroupSubjectGoodsGroup.setGoodsIdList(orderDetail.getGoodsIdList());
                 musicGroupSubjectGoodsGroup.setPrice(orderDetail.getPrice());
                 musicGroupSubjectGoodsGroup.setKitGroupPurchaseType(orderDetail.getKitGroupPurchaseType());
-
                 goodsGroups.add(musicGroupSubjectGoodsGroup);
                 if (musicGroupSubjectGoodsGroup.getType().equals(GoodsType.INSTRUMENT)) {
                     instrumentFee = instrumentFee.add(orderDetail.getPrice());
@@ -637,14 +633,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 if (orderDetail == null || orderDetail.getPrice() == null || orderDetail.getGoodsIdList() == null) {
                     continue;
                 }
-                if (orderDetail.getType().equals(OrderDetailTypeEnum.MUSICAL) && musicOneSubjectClassPlan.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.FREE)) {
-                    orderDetail.setPrice(BigDecimal.ZERO);
-                }
                 MusicGroupSubjectGoodsGroup musicGroupSubjectGoodsGroup = new MusicGroupSubjectGoodsGroup();
                 GoodsType goodsType = orderDetail.getType().equals(OrderDetailTypeEnum.MUSICAL) ? GoodsType.INSTRUMENT : GoodsType.ACCESSORIES;
                 musicGroupSubjectGoodsGroup.setType(goodsType);
                 musicGroupSubjectGoodsGroup.setGoodsIdList(orderDetail.getGoodsIdList());
                 musicGroupSubjectGoodsGroup.setPrice(orderDetail.getPrice());
+                musicGroupSubjectGoodsGroup.setKitGroupPurchaseType(orderDetail.getKitGroupPurchaseType());
                 goodsGroups.add(musicGroupSubjectGoodsGroup);
 
                 if (musicGroupSubjectGoodsGroup.getType().equals(GoodsType.INSTRUMENT)) {

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

@@ -34,7 +34,7 @@ public class MusicGroupSubjectGoodsGroupServiceImpl extends BaseServiceImpl<Long
 	}
 
 	@Override
-	public MusicGroupSubjectGoodsGroup query(String musicGroupId, Integer subjectId) {
-		return musicGroupSubjectGoodsGroupDao.query(musicGroupId, subjectId);
+	public MusicGroupSubjectGoodsGroup query(String musicGroupId, Integer subjectId, String goodsIdList) {
+		return musicGroupSubjectGoodsGroupDao.query(musicGroupId, subjectId, goodsIdList);
 	}
 }

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

@@ -132,6 +132,6 @@
     </select>
     
     <select id="query" resultMap="MusicGroupSubjectGoodsGroup" parameterType="map">
-        SELECT * FROM music_group_subject_goods_group WHERE music_group_id_ = #{musicGroupId} and subject_id_ = #{subjectId}
+        SELECT * FROM music_group_subject_goods_group WHERE music_group_id_ = #{musicGroupId} and subject_id_ = #{subjectId} and goods_id_list_ = #{goodsIdList}
     </select>
 </mapper>