乐器提供方式修改

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/RegisterPayDto.java

@@ -1,9 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 import java.math.BigDecimal;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * 学团注册支付
@@ -20,7 +18,7 @@ public class RegisterPayDto {
     //教谱ids
     private String otherGoodsIds;
     //乐器id->type
-    private Map<Integer,String> goodsGroups;
+    private Map<Long, String> goodsGroups;
 
     //是否余额支付
     private Boolean isUseBalancePayment = false;
@@ -74,11 +72,11 @@ public class RegisterPayDto {
 		this.isUseBalancePayment = isUseBalancePayment;
 	}
 
-    public Map<Integer, String> getGoodsGroups() {
+    public Map<Long, String> getGoodsGroups() {
         return goodsGroups;
     }
 
-    public void setGoodsGroups(Map<Integer, String> goodsGroups) {
+    public void setGoodsGroups(Map<Long, String> goodsGroups) {
         this.goodsGroups = goodsGroups;
     }
 }

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

@@ -470,7 +470,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 }
                 orderAmount = orderAmount.add(goodsGroup.getPrice());
             }
-            orderAmount.subtract(remitFee);
+            orderAmount = orderAmount.subtract(remitFee);
         }
 
         //单独辅件