Merge remote-tracking branch 'origin/master'

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

@@ -864,7 +864,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 if (StringUtils.isNotBlank(goodsGroup.getGoodsIdList())) {
                 	List<Goods> goodsList = goodsDao.findGoodsByIds(goodsGroup.getGoodsIdList());
                 	for(Goods goods : goodsList){
-                		orderAmount = orderAmount.add(goods.getMarketPrice());
+                		orderAmount = orderAmount.add(goods.getDiscountPrice());
                 	}
                 }
             }else{
@@ -1145,7 +1145,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 if (StringUtils.isNotBlank(goodsGroup.getGoodsIdList())) {
                 	List<Goods> goodsList = goodsDao.findGoodsByIds(goodsGroup.getGoodsIdList());
                 	for(Goods goods : goodsList){
-                		orderAmount = orderAmount.add(goods.getMarketPrice());
+                		orderAmount = orderAmount.add(goods.getDiscountPrice());
                 	}
                 }
             }else{

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

@@ -648,7 +648,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                     if (StringUtils.isNotBlank(goodsGroup.getGoodsIdList())) {
                     	List<Goods> goodsList = goodsDao.findGoodsByIds(goodsGroup.getGoodsIdList());
                     	for(Goods goods : goodsList){
-                    		goodsPrice = goodsPrice.add(goods.getMarketPrice());
+                    		goodsPrice = goodsPrice.add(goods.getDiscountPrice());
                     	}
                     }
                 }else{

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

@@ -118,7 +118,7 @@
     </resultMap>
     <select id="findGoodsGroup" resultMap="findGoodsGroupMap">
         SELECT mgs.*, g.id_ g_id_,g.name_ g_name_,g.image_ g_image_,g.brief_ g_brief_, g.group_purchase_price_ g_group_purchase_price_,
-        g.specification_ g_specification_,g.brand_ g_brand,g.desc_ g_desc, g.market_price_ g_market_price_,g.complement_goods_id_list_
+        g.specification_ g_specification_,g.brand_ g_brand,g.desc_ g_desc, g.market_price_ g_market_price_, g.discount_price_ g_discount_price_,g.complement_goods_id_list_
         g_complement_goods_id_list_
         FROM music_group_subject_goods_group mgs,goods g
         WHERE FIND_IN_SET (g.id_ ,mgs.goods_id_list_)