fix 机构类型不存在时兼容

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

@@ -20,7 +20,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 +74,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

@@ -469,7 +469,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 }
             }
         }else if (registerPayDto.getGoodsGroups() != null && registerPayDto.getGoodsGroups().size() > 0) {
-            String goodsGroupIds = registerPayDto.getGoodsGroups().keySet().stream().map(key -> key.toString()).collect(Collectors.joining(","));
+            String goodsGroupIds = registerPayDto.getGoodsGroups().keySet().stream().map(key->key.toString()).collect(Collectors.joining(","));
             goodsGroups = musicGroupSubjectGoodsGroupService.findGoodsGroupByIds(goodsGroupIds);
             for (MusicGroupSubjectGoodsGroup goodsGroup : goodsGroups) {
                 Map groupType = JSONObject.parseObject(goodsGroup.getKitGroupPurchaseTypeJson(), HashMap.class);
@@ -503,7 +503,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 }
                 orderAmount = orderAmount.add(goodsGroup.getPrice());
             }
-            orderAmount.subtract(remitFee);
+            orderAmount =  orderAmount.subtract(remitFee);
         }
 
         //单独辅件
@@ -1489,7 +1489,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 		if (orderList == null || orderList.size() == 0) {
 			throw new BizException("请走报名缴费流程");
 		}*/
-        
+
         // 判断当前是否是续费状态
         if (musicGroupStudentFee.getPaymentStatus() != PaymentStatus.NON_PAYMENT) {
             throw new BizException("已缴费");
@@ -1812,7 +1812,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             courseScheduleDao.updateCourseScheduleSchool("MUSIC",musicGroupId,musicGroup.getSchoolId());
         }
         List<Integer> months = subFeeSettingDto.getMonths();
-        
+
         //判断缴费日历是否修改
 		boolean isModifiedOfCalender = false;
 
@@ -1833,7 +1833,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 			if (num > 0) {
 				throw new BizException("缴费周期更新失败，当前乐团有未缴费的学员");
 			}
-			
+
 			// 删除乐团相关付费周期
 			musicGroupPaymentCalenderDao.delByGroupId(musicGroupId);
 			if (months != null && months.size() > 0) {