Merge remote-tracking branch 'origin/master'

cms/src/main/java/com/ym/mec/cms/controller/NewsController.java

@@ -45,7 +45,6 @@ public class NewsController extends BaseController {
 	@ApiOperation("资讯列表分页查询")
 	@GetMapping(value = "/homeList")
 	public Object getHomeList(NewsInformationQueryInfo queryInfo) {
-		queryInfo.setRows(5);
 		SysUser user = sysUserFeignService.queryUserInfo();
 		return succeed(sysNewsInformationService.getHomeList(user, queryInfo));
 	}

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

@@ -119,7 +119,7 @@ public interface MusicGroupPaymentCalenderDao extends BaseDAO<Long, MusicGroupPa
      * @param configValue:
      * @return void
      */
-    List<Map<Long, Long>> queryCalenderByDay(String configValue);
+    List<Map<Long, Long>> queryCalenderByDay(@Param("configValue") String configValue, @Param("format") String format);
 
     List<MusicGroupPaymentCalender> queryByIds(@Param("calenderId") Set<Long> calenderId);
 

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

@@ -160,7 +160,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 //		musicGroupStudentFeeDao.updateFeeStatus();
 		//获取距离缴费开启指定天数后的缴费明细
 		String configValue = sysConfigDao.findConfigValue("push_payment_detail");
-		Map<Long, Long> maps = MapUtil.convertIntegerMap(musicGroupPaymentCalenderDao.queryCalenderByDay(configValue));
+		Map<Long, Long> maps = MapUtil.convertIntegerMap(musicGroupPaymentCalenderDao.queryCalenderByDay(configValue,format));
 		if(maps != null && maps.size() > 0){
 			Set<Long> calenderId = maps.keySet();
 			List<CalenderPushDto> calenderPushDtos = musicGroupPaymentCalenderDao.getCalenderPushDto(calenderId);

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

@@ -239,7 +239,8 @@
         SELECT mgpcd.music_group_payment_calender_id_ 'key',COUNT(mgpcd.payment_status_) 'value'
         FROM music_group_payment_calender_detail mgpcd
         WHERE mgpcd.music_group_payment_calender_id_ IN
-        (SELECT id_ FROM music_group_payment_calender WHERE payment_status_ != 0 AND DATEDIFF('',DATE_FORMAT(start_payment_date_,'%Y-%m-%d')) = #{configValue})
+        (SELECT id_ FROM music_group_payment_calender WHERE payment_status_ != 0
+        AND DATEDIFF(start_payment_date_,#{format}) = #{configValue})
         AND mgpcd.payment_status_ = 'NON_PAYMENT'
         GROUP BY mgpcd.music_group_payment_calender_id_
     </select>
@@ -274,9 +275,9 @@
     </select>
     <select id="getMusicCalenderPushDto" resultMap="CalenderPushDto">
         SELECT mg.payment_valid_start_date_,mg.payment_valid_end_date_,
-        mg.educational_teacher_id_,su.phone_ FROM music_group mg
+        mg.educational_teacher_id_,su.phone_,mg.name_ FROM music_group mg
         LEFT JOIN sys_user su ON mg.educational_teacher_id_ = su.id_
         WHERE mg.payment_valid_end_date_ IS NOT NULL AND
-        DATEDIFF(#{format},DATE_FORMAT(mg.payment_valid_end_date_,'%Y-%m-%d')) = #{configValue}
+        DATEDIFF(mg.payment_valid_end_date_,#{format}) = #{configValue}
     </select>
 </mapper>

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

@@ -101,12 +101,12 @@
 				AND spo.status_ = #{status}
 			</if>
 			<if test="search != null and search != ''">
-				AND (su.user_name_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%'))
+				AND (su.username_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%'))
 			</if>
 		</where>
 	</sql>
 	<select id="queryStudentGoodsOrders" resultMap="StudentGoodsSellDto">
-		SELECT spo.*,sgs.goods_json_,sgs.total_amount_,sgs.market_amount_,su.user_name_ FROM student_payment_order spo
+		SELECT spo.*,sgs.goods_json_,sgs.total_amount_,sgs.market_amount_,su.username_ FROM student_payment_order spo
 		LEFT JOIN student_goods_sell sgs ON spo.order_no_ = sgs.order_no_
 		LEFT JOIN sys_user su ON sgs.user_id_ = su.id_
 		<include refid="queryStudentGoodsOrdersSql"/>