乐团乐器提供方式增加减免课程费用

乐团增加可选课程费用

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

@@ -118,6 +118,8 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                 hasRouteAmount = hasRouteAmount.add(actualAmount);
                 i++;
 
+                BigDecimal agreeCostPrice = goods.getAgreeCostPrice() == null ? BigDecimal.ZERO : goods.getAgreeCostPrice();
+
                 SellOrder sellOrder = new SellOrder();
                 sellOrder.setOrganId(studentPaymentRouteOrderDto.getOrganId());
                 sellOrder.setSchoolId(studentPaymentRouteOrderDto.getSchoolId());
@@ -128,7 +130,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                 sellOrder.setBalanceAmount(BigDecimal.ZERO);
                 sellOrder.setExpectAmount(actualAmount);
                 sellOrder.setSellCost(goods.getDiscountPrice().multiply(new BigDecimal(goodsMap.getValue())));
-                sellOrder.setSellCost2(goods.getAgreeCostPrice().multiply(new BigDecimal(goodsMap.getValue())));
+                sellOrder.setSellCost2(agreeCostPrice.multiply(new BigDecimal(goodsMap.getValue())));
                 sellOrder.setNum(goodsMap.getValue());
                 sellOrder.setUserId(studentPaymentRouteOrderDto.getUserId());
                 sellOrder.setPaymentChannel(studentPaymentRouteOrderDto.getPaymentChannel());

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

@@ -137,7 +137,7 @@
             (#{sellOrder.organId},#{sellOrder.schoolId},#{sellOrder.transNo},#{sellOrder.orderId},#{sellOrder.orderNo},
             #{sellOrder.expectAmount},#{sellOrder.actualAmount},#{sellOrder.balanceAmount},#{sellOrder.type},#{sellOrder.goodsId},
             #{sellOrder.goodsName},#{sellOrder.sellCost},#{sellOrder.sellCost2},#{sellOrder.num},#{sellOrder.userId},
-            #{sellOrder.paymentChannel},#{sellOrder.merNo},#{sellOrder.sellTime},#{sellOrder.createIme},#{sellOrder.updateTime}
+            #{sellOrder.paymentChannel},#{sellOrder.merNo},#{sellOrder.sellTime},#{sellOrder.createIme},#{sellOrder.updateTime})
         </foreach>
     </insert>