Merge branch 'master' into feature_change_subject

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentRegistration.java

@@ -110,6 +110,8 @@ public class StudentRegistration {
 
     //乐团
     private OwnershipType ownershipType;
+    
+    private Integer chargeTypeId;
 
     public BigDecimal getBalance() {
         return balance;
@@ -381,4 +383,12 @@ public class StudentRegistration {
     public void setOwnershipType(OwnershipType ownershipType) {
         this.ownershipType = ownershipType;
     }
+
+	public Integer getChargeTypeId() {
+		return chargeTypeId;
+	}
+
+	public void setChargeTypeId(Integer chargeTypeId) {
+		this.chargeTypeId = chargeTypeId;
+	}
 }

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

@@ -117,6 +117,7 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
 						Integer integer = organMap.get(row.get(s));
 						if(integer == null){
 							LOGGER.error("支出记录导入异常：分部校验失败 param:{}",objectMap);
+							continue valueIsNull;
 						}else {
 							objectMap.put("organId", integer);
 						}

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

@@ -139,7 +139,7 @@
         <h2>三、请假</h2>
         1、基于教学进度和质量保证，甲方对于课程延续性有严格要求，因此乙方学员应尽量参加课程，无特殊情况则应避免请假。<br />
         <div class="bold">2、VIP课程学员如有特殊情况需要请假的，应提前4小时以上通过管乐迷App完成请假，否则当次课程将视同发生，系统将自动记录结算课时并扣除相应课程费用。</div>
-        3、VIP学员如遇特殊情况需要长期请假时，可向□甲方/□授课老师申请办理临时休会。学员可在6个月内申请复学，超过6个月未申请复学的，甲方有权按自动退会处理。<span class="bold">VIP课程为一对二课程的，其中一位学员申请临时休会的，还需征得同组另一位学员的同意后方可申请休会。否则将不予受理。</span><br />
+        3、VIP学员如遇特殊情况需要长期请假时，可向甲方/授课老师申请办理临时休会。学员可在6个月内申请复学，超过6个月未申请复学的，甲方有权按自动退会处理。<span class="bold">VIP课程为一对二课程的，其中一位学员申请临时休会的，还需征得同组另一位学员的同意后方可申请休会。否则将不予受理。</span><br />
         <span class="bold">4、鉴于团课的特殊性，团课学员个人请假，当次课程仍视同发生，系统将自动记录结算课时并扣除相应课程费用。</span><br />
         5、每期课程均有相对应的有效期，乙方应在有效期内完成课程，10次课一期的，自交费之日起4个月内有效；20次课一期的，自交费之日起8个月内有效；40次课一期的，自交费之日起16个月内有效。<span class="bold">如果由于指导老师请假等原因造成课程不能如期完成的，课程有效期将顺延；如课程超出有效期限，乙方所缴纳的课程费用将自动扣除逾期未完成的课时后自动清零。</span><br />
 

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -137,6 +137,7 @@ public class MusicGroupController extends BaseController {
             return failed("乐团在"+musicGroup.getStatus().getMsg()+",不能缴费");
         }
         studentRegistration.setOwnershipType(musicGroup.getOwnershipType());
+        studentRegistration.setChargeTypeId(musicGroup.getChargeTypeId());
 
         return succeed(studentRegistration);
     }

mec-web/src/main/java/com/ym/mec/web/controller/education/EduRepairController.java

@@ -5,7 +5,6 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
-import com.ym.mec.biz.dal.dto.GoodsSellDto;
 import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.entity.StudentRepair;
 import com.ym.mec.biz.dal.page.GoodsCategoryQueryInfo;
@@ -18,7 +17,6 @@ import com.ym.mec.biz.service.SubjectService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
-import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.util.date.DateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -159,10 +157,4 @@ public class EduRepairController extends BaseController {
         return succeed(goodsCategoryService.queryPage(queryInfo));
     }
 
-    @ApiOperation(value = "获取和教务相关的学员商品订单")
-    @GetMapping("/queryGoodsCategoryPage")
-    public Object queryGoodsOrders(QueryInfo queryInfo){
-        return succeed();
-    }
-
 }