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

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

@@ -217,7 +217,12 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 			applyClass.setClassId(applyInfo.getClassId());
 			//<subName>学员专业名称</subName>
 			CourseGroupInfo groupInfo = courseGroupInfoDao.get(applyInfo.getCourseId());
-			applyClass.setSubName(groupInfo.getSubName());
+			String subName = null;
+			String[] subNames = groupInfo.getSubName().split(".");
+			if(subNames != null){
+				subName = subNames.length==1?subNames[0]:subNames[1];
+			}
+			applyClass.setSubName(subName);
 			//<remark>备注</remark>
 			applyClass.setRemark(order.getRemark());
 			List<Course> courses = new ArrayList<>();
@@ -231,8 +236,8 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 //			applyClass.setAmount(order.getAmount());
 			applyClass.setAmount(new BigDecimal(0));
 			//<tuiFee>学费金额</tuiFee>
-//			applyClass.setTuiFee(order.getTuiFee());
-			applyClass.setTuiFee(new BigDecimal(0));
+			applyClass.setTuiFee(order.getTuiFee());
+//			applyClass.setTuiFee(new BigDecimal(0));
 			//<goodsFee>乐器费用</goodsFee>
 //			applyClass.setGoodsFee(order.getGoodsFee());
 			applyClass.setGoodsFee(new BigDecimal(0));