Merge branch 'master' into river

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

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

@@ -52,7 +52,10 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
 	@Override
 	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 	public Boolean renewForCallback(StudentPaymentOrder studentPaymentOrder) {
-		studentPaymentOrderDao.update(studentPaymentOrder);
+		int updateCount = studentPaymentOrderDao.update(studentPaymentOrder);
+		if(updateCount <= 0){
+			throw new BizException("订单更新失败");
+		}
 		Integer userId = studentPaymentOrder.getUserId();
 		SysUser sysUser = sysUserFeignService.queryUserById(userId);
 		SporadicChargeInfo info = sporadicChargeInfoDao.get(Integer.parseInt(studentPaymentOrder.getMusicGroupId()));

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

@@ -185,7 +185,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             vipGroupService.orderCallback(order);
         } else if (order.getType().equals(OrderTypeEnum.RENEW)) {
             musicGroupService.renewForCallback(order);
-        } else if (order.getType().equals(OrderTypeEnum.SPORADIC)) {
+        }else if (order.getType().equals(OrderTypeEnum.SPORADIC)){
             sporadicChargeInfoService.renewForCallback(order);
         }
     }
@@ -215,7 +215,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                     vipGroupService.orderCallback(order);
                 } else if (order.getType().equals(OrderTypeEnum.RENEW)) {
                     musicGroupService.renewForCallback(order);
-                } else if (order.getType().equals(OrderTypeEnum.SPORADIC)) {
+                }else if (order.getType().equals(OrderTypeEnum.SPORADIC)){
                     sporadicChargeInfoService.renewForCallback(order);
                 }
             } catch (Exception e) {
@@ -225,5 +225,4 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         }
 
     }
-
 }

mec-biz/src/main/resources/config/contracts/courses.ftl

@@ -98,9 +98,11 @@
                     <span>所在班级：${studentInfo.grade!} ${studentInfo.clazz!}</span>
                 </div>
                 </#if>
+                <#if studentInfo.subject.name?default("")?trim?length gt 1>
                 <div class="iInfo">
                     <span>所在声部：${studentInfo.subject.name!}</span>
                 </div>
+                </#if>
             </div>
         
             
@@ -174,7 +176,7 @@
                 <span>日期：${.now?string("yyyy年MM月dd日")}</span>
             </div>
             </#if>
-            <div class="sign">乙方签字：${studentInfo.parentsName!}
+            <div class="sign">乙方签字：${studentInfo.realName!}
                 <span>日期：${.now?string("yyyy年MM月dd日")} </span>
             </div>
         	<#else>

mec-biz/src/main/resources/config/contracts/goods.ftl

@@ -97,9 +97,11 @@
                     <span>所在班级：${studentInfo.grade!} ${studentInfo.clazz!}</span>
                 </div>
                 </#if>
+                <#if studentInfo.subject.name?default("")?trim?length gt 1>
                 <div class="iInfo">
                     <span>所在声部：${studentInfo.subject.name!}</span>
                 </div>
+                </#if>
             </div>
         </div>                     
         
@@ -153,7 +155,7 @@
                 <span>日期：${.now?string("yyyy年MM月dd日")}</span>
             </div>
             </#if>
-            <div class="sign">乙方签字：${studentInfo.parentsName!}
+            <div class="sign">乙方签字：${studentInfo.realName!}
                 <span>日期：${.now?string("yyyy年MM月dd日")} </span>
             </div>
         	<#else>

mec-common/common-core/src/main/java/com/ym/mec/common/controller/BaseController.java

@@ -2,15 +2,16 @@ package com.ym.mec.common.controller;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.ym.mec.common.exception.BizException;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
+import org.springframework.security.access.AccessDeniedException;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.exception.BizException;
 
 @ControllerAdvice
 public class BaseController {
@@ -69,8 +70,10 @@ public class BaseController {
 		}
 		logger.error("System Error", e);
 //		return failed(e.getMessage());
-		if(ex instanceof BizException){
+		if(e instanceof BizException){
 			return failed(e.getMessage());
+		}else if(e instanceof AccessDeniedException){
+			return failed("禁止访问");
 		}
 		return failed("系统繁忙");
 	}

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/eseal/provider/TsignPlugin.java

@@ -159,7 +159,7 @@ public class TsignPlugin implements ESealPlugin, InitializingBean, DisposableBea
 		int sealId = 0;
 		// 设置接口调用方(平台方)签章位置信息
 		posBean.setPosPage("1");// 签署页码，若为多页签章，支持页码格式“1-3,5,8“，若为坐标定位时，不可空
-		posBean.setKey("甲方（签字）");
+		posBean.setKey("甲方签章");
 		// 签署位置X坐标,默认值为0,以pdf页面的左下角作为原点,控制距离页面左端的横向移动距离,单位为px
 		posBean.setPosX(100);
 		// 签署位置Y坐标,默认值为0,以pdf页面的左下角作为原点,控制距离页面底端的纵向移动距离,单位为px