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

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

@@ -66,6 +66,15 @@ public class FinancialExpenditure extends BaseEntity {
 
 	@ApiModelProperty(value = "费用项目str",required = false)
 	private String feeProjectItem;
+
+	@ApiModelProperty(value = "收款帐号",required = false)
+	private String merNo;
+
+	@ApiModelProperty(value = "开户行",required = false)
+	private String bankAddress;
+
+	@ApiModelProperty(value = "收款账户名",required = false)
+	private String merNoName;
 	/**  */
 	private Date createTime;
 	/**  */
@@ -89,6 +98,30 @@ public class FinancialExpenditure extends BaseEntity {
 
 	private boolean maintenanceFeeFlag;
 
+	public String getMerNo() {
+		return merNo;
+	}
+
+	public void setMerNo(String merNo) {
+		this.merNo = merNo;
+	}
+
+	public String getBankAddress() {
+		return bankAddress;
+	}
+
+	public void setBankAddress(String bankAddress) {
+		this.bankAddress = bankAddress;
+	}
+
+	public String getMerNoName() {
+		return merNoName;
+	}
+
+	public void setMerNoName(String merNoName) {
+		this.merNoName = merNoName;
+	}
+
 	public boolean isRefundInstrumentFeeFlag() {
 		return refundInstrumentFeeFlag;
 	}

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

@@ -609,8 +609,6 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
                         if(Objects.nonNull(row.get(s))){
                             objectMap.put(columnValue, Objects.equals("是",row.get(s))?true:false);
                         }
-                    }else if(Objects.equals(columnValue,"amount")){
-                        objectMap.put(columnValue, Objects.isNull(row.get(s)) || StringUtils.isEmpty(row.get(s).toString())?0:row.get(s));
                     }else if(Objects.equals(columnValue,"organName")){
                         if(Objects.isNull(row.get(s)) || StringUtils.isEmpty(row.get(s).toString())){
                             throw new BizException("乐团退费模板错误: 请录入分部信息");
@@ -624,9 +622,21 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
                     }
                 }
                 FinancialExpenditure financialExpenditure = JSONObject.parseObject(objectMap.toJSONString(),FinancialExpenditure.class);
-                if(StringUtils.isEmpty(financialExpenditure.getMusicGroupId()) || Objects.isNull(financialExpenditure.getStudentId())){
+                if(StringUtils.isEmpty(financialExpenditure.getMusicGroupId())
+                        || Objects.isNull(financialExpenditure.getStudentId())){
                     throw new BizException("乐团退费模板错误: 乐团编号或学员编号不可为空");
                 }
+                if(Objects.isNull(financialExpenditure.getOrganId())){
+                    throw new BizException("乐团退费模板错误: 请填写分部信息");
+                }
+                if(Objects.isNull(financialExpenditure.getAmount())){
+                    throw new BizException("乐团退费模板错误: 退费金额不可为空");
+                }
+                if(StringUtils.isEmpty(financialExpenditure.getMerNo()) ||
+                        StringUtils.isEmpty(financialExpenditure.getBankAddress()) ||
+                        StringUtils.isEmpty(financialExpenditure.getMerNoName())){
+                    throw new BizException("乐团退费模板错误: 请完整填写收款账户信息");
+                }
                 financialExpenditureList.add(financialExpenditure);
             }
         }

mec-web/src/main/resources/columnMapper.ini

@@ -54,6 +54,9 @@
 退还课程费用 = refundCourseFee
 退款金额（元） = amount
 情况说明 = cause
+收款帐号 = merNo
+开户行 = bankAddress
+收款账户名 = merNoName
 
 [兑换码分配模板表]
 代码 = code