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

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

@@ -233,7 +233,8 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             sysUserCashAccountService.updateBalance(order.getUserId(), order.getActualAmount(),
                     PlatformCashAccountDetailTypeEnum.REFUNDS, memo + ",订单号:" + order.getOrderNo());
 
-            if (order.getPaymentChannel().equals("ADAPAY")
+            if (StringUtils.isNotBlank(order.getPaymentChannel())
+                    && order.getPaymentChannel().equals("ADAPAY")
                     && !rpMap.containsKey("simulation")) {
                 confirmOrder(order);
             }
@@ -257,7 +258,9 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
 
         callOrderCallBack(order);
 
-        if (status.equals(DealStatusEnum.SUCCESS) && order.getPaymentChannel().equals("ADAPAY")
+        if (status.equals(DealStatusEnum.SUCCESS)
+                && StringUtils.isNotBlank(order.getPaymentChannel())
+                && order.getPaymentChannel().equals("ADAPAY")
                 && !rpMap.containsKey("simulation")) {
             confirmOrder(order);
         }

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

@@ -202,7 +202,7 @@
                 <span>日期：${.now?string("yyyy年MM月dd日")}</span>
             </div>
             </#if>
-            <div class="sign">乙方签章：${studentInfo.realName!}
+            <div class="sign">乙方签章：
                 <span>日期：${.now?string("yyyy年MM月dd日")} </span>
             </div>
         	</#if>

mec-web/src/main/java/com/ym/mec/web/controller/ContractsController.java

@@ -3,6 +3,7 @@ package com.ym.mec.web.controller;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -78,4 +79,9 @@ public class ContractsController extends BaseController {
 		return succeed(contractService.queryPracticeCoursesContract(sysUser.getId(), courseSectionNum, startDate, endDate, fee));
 	}
 
+	@GetMapping("transferProduceContract")
+	public HttpResponseResult transferProduceContract(Integer userId,String musicGroupId){
+		contractService.transferProduceContract(userId,musicGroupId);
+		return succeed();
+	}
 }