Merge branch 'doubleEleven2020'

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

@@ -394,6 +394,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             throw new BizException("订单金额异常");
         }
         if (chargeInfo.getMaxNum() != null) {
+            if(chargeInfo.getMaxNum() <= chargeInfo.getPaidNum()){
+                throw new BizException("活动人数暂时已满，请稍后再试");
+            }
             chargeInfo.setPaidNum(chargeInfo.getPaidNum() + 1);
             chargeInfo.setUpdateTime(new Date());
             int update = sporadicChargeInfoDao.update(chargeInfo);

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

@@ -81,7 +81,7 @@
 				and name_ like concat('%',#{search},'%')
 			</if>
 		</where>
-		<include refid="global.orderby" />
+		order by create_on_ desc
 		<include refid="global.limit" />
 	</select>
 </mapper>

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

@@ -103,7 +103,7 @@
 	<select id="queryPage" parameterType="map" resultMap="BaseResultMap">
 		select * from luck_draw_prize
 		<include refid="queryCondition" />
-		<include refid="global.orderby" />
+		order by create_on_ desc
 		<include refid="global.limit" />
 	</select>