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

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

@@ -17,6 +17,8 @@ import java.util.Map;
 
 public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrder> {
 
+    StudentPaymentOrder lockOrder(@Param("id") Long id);
+
     /**
      * 查询商品列表
      *

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

@@ -824,6 +824,10 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		params.put("endDate", endDate);
 		params.put("fee", fee);
 
+		params.put("isShowVisualSeal", false);
+
+		params.put("ownershipType", "OWN");
+
 		templateEngine.render(params, "practice.ftl", srcFile);
 
 		String result = "";
@@ -871,6 +875,10 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		params.put("endDate", endDate);
 		params.put("fee", fee);
 
+		params.put("isShowVisualSeal", false);
+
+		params.put("ownershipType", "OWN");
+
 		templateEngine.render(params, "practice.ftl", srcFile);
 
 		// 生成借款协议PDF

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

@@ -697,7 +697,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 //团购乐器减免课程费用
                 if (goodsGroup.getType().equals(GoodsType.INSTRUMENT) && goodsGroup.getRemissionCourseFee() != null && musicOneSubjectClassPlan.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.GROUP)) {//团购
                     orderAmount = orderAmount.subtract(goodsGroup.getRemissionCourseFee());
-                    courseFee.subtract(goodsGroup.getRemissionCourseFee());
+                    courseFee = courseFee.subtract(goodsGroup.getRemissionCourseFee());
                 }
             }
         } else if (registerPayDto.getGoodsGroups() != null && registerPayDto.getGoodsGroups().size() > 0) {

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

@@ -1467,6 +1467,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		Integer userId = order.getUserId();
 		boolean isOk=order.getStatus().equals(DealStatusEnum.SUCCESS);
 
+		StudentPaymentOrder studentPaymentOrder = studentPaymentOrderDao.lockOrder(order.getId());
+
 		List<StudentPaymentOrder> userOrders = studentPaymentOrderDao.findUserBuyVipGroupOrder(userId, vipGroupId.intValue());
 		Map<DealStatusEnum, List<StudentPaymentOrder>> statusOrdersMap = userOrders.stream().collect(Collectors.groupingBy(StudentPaymentOrder::getStatus));
 		if(!CollectionUtils.isEmpty(statusOrdersMap.get(DealStatusEnum.SUCCESS))){
@@ -1474,14 +1476,13 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			return;
 		}
 
-		StudentPaymentOrder studentPaymentOrder = studentPaymentOrderDao.get(order.getId());
 		if(studentPaymentOrder.getStatus().equals(DealStatusEnum.SUCCESS)){
 			return;
 		}
 
 		studentPaymentOrderDao.update(order);
 
-		ClassGroup classGroup=classGroupDao.lockClassGroup(order.getClassGroupId().longValue());
+		ClassGroup classGroup=classGroupDao.get(order.getClassGroupId());
 
 		//将学生加入到班级，更新班级报名状态及人数信息
 		if(!isOk){

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

@@ -155,6 +155,35 @@
         10.3用户对本服务或本协议有任何疑问、意见或建议的，可通过以下方式联系本公司，本公司将及时回复和处理用户请求。<br />
         本公司联系方式：027-87718176
 
+		<div class="signature">
+        	<#if isShowVisualSeal>
+        	<#if ownershipType == 'OWN'>
+            <div class="sign">甲方签章：深圳大雅乐盟网络教育股份有限公司<img class="cachet" src="https://daya-online.oss-cn-beijing.aliyuncs.com/website/cachet.png" alt="" />
+                <span>日期：${.now?string("yyyy年MM月dd日")}</span>
+            </div>
+            <#else>
+            <div class="sign">甲方签章：武汉长乐长风乐器销售有限公司<img class="cachet" src="https://daya-online.oss-cn-beijing.aliyuncs.com/website/clcf.png" alt="" />
+                <span>日期：${.now?string("yyyy年MM月dd日")}</span>
+            </div>
+            </#if>
+            <div class="sign">乙方签字：${studentInfo.realName!}
+                <span>日期：${.now?string("yyyy年MM月dd日")} </span>
+            </div>
+        	<#else>
+        	<#if ownershipType == 'OWN'>
+            <div class="sign">甲方签章：深圳大雅乐盟网络教育股份有限公司
+                <span>日期：${.now?string("yyyy年MM月dd日")}</span>
+            </div>
+            <#else>
+            <div class="sign">甲方签章：武汉长乐长风乐器销售有限公司
+                <span>日期：${.now?string("yyyy年MM月dd日")}</span>
+            </div>
+            </#if>
+            <div class="sign">乙方签章：
+                <span>日期：${.now?string("yyyy年MM月dd日")} </span>
+            </div>
+        	</#if>
+        </div>
     </div>
 </body>
 </html>

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

@@ -698,4 +698,8 @@
             SELECT username_ name ,id_ userId,phone_ phone FROM sys_user
             WHERE id_ = #{search} OR username_ LIKE CONCAT('%',#{search},'%') OR phone_ LIKE CONCAT('%',#{search},'%')
     </select>
+
+    <select id="lockOrder" resultMap="StudentPaymentOrder">
+        SELECT * FROM student_payment_order WHERE id_ = #{id} FOR UPDATE
+    </select>
 </mapper>

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

@@ -98,7 +98,7 @@
         LEFT JOIN sys_user s ON s.id_ = sv.student_id_
         LEFT JOIN music_group mg ON sv.music_group_id_ = mg.id_
         <include refid="queryPageSql"/>
-        ORDER BY sv.id_ DESC
+        ORDER BY sv.visit_time_ DESC
         <include refid="global.limit"/>
     </select>
     <sql id="queryPageSql">