Merge branch 'master' of http://git.dayaedu.com/yonge/collect_fee

pom.xml

@@ -182,7 +182,8 @@
 		    <groupId>net.sf.json-lib</groupId>
 		    <artifactId>json-lib</artifactId>
 		    <version>2.4</version>
-		</dependency>
+		    <classifier>jdk15</classifier>
+	    </dependency>
 	</dependencies>
 
 	<build>

src/main/java/com/ym/mec/collectfee/service/impl/SchoolServiceImpl.java

@@ -18,6 +18,7 @@ import com.ym.mec.collectfee.entity.ResponseCourseEntity;
 import com.ym.mec.collectfee.entity.School;
 import com.ym.mec.collectfee.service.SchoolService;
 import com.ym.mec.collectfee.utils.Constants;
+import com.ym.mec.collectfee.utils.ShortUrlUtil;
 import com.ym.mec.collectfee.utils.yqpay.DateUtils;
 
 @Service
@@ -80,7 +81,9 @@ public class SchoolServiceImpl extends BaseServiceImpl<Integer, School> implemen
 			//获取所有用户手机号列表
 			List<String> userPhone = applyInfoDao.findUserByClass(classId,null);
 			String[] objects=userPhone.toArray(new String[userPhone.size()]);
-			SmsExample.setBatchOnlySms(appId,secretKey,host,algorithm,String.format(Constants.SMS_TEMPLATE, DateUtils.getDayForAfter(new Date(), 2)),null,objects,isGizp,encode);
+			SmsExample.setBatchOnlySms(appId,secretKey,host,algorithm,
+					String.format(Constants.SMS_TEMPLATE, DateUtils.getDayForAfter(new Date(), 2), ShortUrlUtil.sinaShortUrl("http://pay.dayaedu.com/?schoolId=2&classId=10381&cityId=1302")),
+					null,objects,isGizp,encode);
 		}
 	}
 	

src/main/resources/config/mybatis/RenewalsMapper.xml

@@ -69,6 +69,6 @@
 
 	<!-- 根据order_id获取小课信息 -->
 	<select id="getRenewalsByOrderId" resultMap="Renewals">
-		SELECT * FROM `renewals` WHERE order_id = #{orderId}
+		SELECT * FROM `renewals` WHERE order_id = #{orderId} limit 1
 	</select>
 </mapper>