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

src/main/java/com/ym/mec/collectfee/controller/YqPayController.java

@@ -4,7 +4,6 @@ import com.alibaba.druid.sql.visitor.functions.Now;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ym.mec.collectfee.common.sms.SmsExample;
 import com.ym.mec.collectfee.common.web.BaseController;
 import com.ym.mec.collectfee.entity.*;
 import com.ym.mec.collectfee.service.*;
@@ -129,6 +128,9 @@ public class YqPayController extends BaseController {
         //2 版本为3.0（ 26），不收乐器费用，收押金800放乐器费用
         if (courseGroupInfo.getFeeType().equals(26) && order.getInstrument() != null && !order.getInstrument().isEmpty()) {
             instrumentPrice = new BigDecimal("800");
+            if(school.getAmountType() != null && school.getAmountType().equals(2)){
+                instrumentPrice = new BigDecimal("1500");
+            }
         }
         amount = amount.add(instrumentPrice);
 
@@ -250,6 +252,9 @@ public class YqPayController extends BaseController {
         //2 版本为3.0（ 26），不收乐器费用，收押金800放乐器费用
         if (courseGroupInfo.getFeeType().equals(26) && order.getInstrument() != null && !order.getInstrument().isEmpty()) {
             instrumentPrice = new BigDecimal("800");
+            if(school.getAmountType() != null && school.getAmountType().equals(2)){
+                instrumentPrice = new BigDecimal("1500");
+            }
         }
         amount = amount.add(instrumentPrice);
 

src/main/java/com/ym/mec/collectfee/entity/School.java

@@ -42,7 +42,7 @@ public class School {
 	/**  */
 	private java.util.Date updateTime;
 	
-	private int amountType;
+	private Integer amountType;
 
 	public String geteDeposit() {
 		return eDeposit;
@@ -153,11 +153,11 @@ public class School {
 		this.isSingle = isSingle;
 	}
 
-	public int getAmountType() {
+	public Integer getAmountType() {
 		return amountType;
 	}
 
-	public void setAmountType(int amountType) {
+	public void setAmountType(Integer amountType) {
 		this.amountType = amountType;
 	}