Browse Source

fix 3.0乐器自备价格问题

周箭河 5 years ago
parent
commit
657bd6b16a

+ 2 - 2
src/main/java/com/ym/mec/collectfee/controller/YqPayController.java

@@ -125,7 +125,7 @@ public class YqPayController extends BaseController {
         }
 
         //2 版本为3.0( 26),不收乐器费用,收押金800放乐器费用
-        if (courseGroupInfo.getFeeType().equals(26)) {
+        if (courseGroupInfo.getFeeType().equals(26) && order.getInstrument() != null && !order.getInstrument().isEmpty()) {
             instrumentPrice = new BigDecimal("800");
         }
         amount = amount.add(instrumentPrice);
@@ -234,7 +234,7 @@ public class YqPayController extends BaseController {
         }
 
         //2 版本为3.0( 26),不收乐器费用,收押金800放乐器费用
-        if (courseGroupInfo.getFeeType().equals(26)) {
+        if (courseGroupInfo.getFeeType().equals(26) && order.getInstrument() != null && !order.getInstrument().isEmpty()) {
             instrumentPrice = new BigDecimal("800");
         }
         amount = amount.add(instrumentPrice);