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

乐团增加可选课程费用

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

@@ -69,7 +69,7 @@ public class Goods {
 
 	/** 协议成本价 */
 	@ApiModelProperty(value = "协议成本价",required = false)
-	private BigDecimal agreeCostPrice;
+	private String agreeCostPrice;
 
 	/** 页面简介 */
 	@ApiModelProperty(value = "页面简介",required = false)
@@ -118,11 +118,11 @@ public class Goods {
 	@ApiModelProperty(value = "商品类型", required = false)
 	private GoodsType type;
 
-	public BigDecimal getAgreeCostPrice() {
+	public String getAgreeCostPrice() {
 		return agreeCostPrice;
 	}
 
-	public void setAgreeCostPrice(BigDecimal agreeCostPrice) {
+	public void setAgreeCostPrice(String agreeCostPrice) {
 		this.agreeCostPrice = agreeCostPrice;
 	}
 

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

@@ -77,7 +77,7 @@ public class SellOrder {
      * 销售成本2
      */
     @ApiModelProperty(value="销售成本2")
-    private BigDecimal sellCost2;
+    private String sellCost2;
 
     /**
     * 销售类型
@@ -295,11 +295,11 @@ public class SellOrder {
         this.goodsName = goodsName;
     }
 
-    public BigDecimal getSellCost2() {
+    public String getSellCost2() {
         return sellCost2;
     }
 
-    public void setSellCost2(BigDecimal sellCost2) {
+    public void setSellCost2(String sellCost2) {
         this.sellCost2 = sellCost2;
     }
 

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

@@ -120,7 +120,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                 hasRouteAmount = hasRouteAmount.add(actualAmount);
                 i++;
 
-                BigDecimal agreeCostPrice = goods.getAgreeCostPrice() == null ? BigDecimal.ZERO : goods.getAgreeCostPrice();
+               // String agreeCostPrice = goods.getAgreeCostPrice() == null ? BigDecimal.ZERO : goods.getAgreeCostPrice();
 
                 SellOrder sellOrder = new SellOrder();
                 sellOrder.setOrganId(studentPaymentRouteOrderDto.getOrganId());
@@ -132,7 +132,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(agreeCostPrice.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

@@ -184,4 +184,6 @@
             </if>
         </where>
     </sql>
+
+    <select id="getSellOrder" resultMap="SellOrder">
 </mapper>