Merge branch 'maintenance_feature'

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

@@ -276,7 +276,7 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
         List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailDao.getOrderDetailByType(order.getId(), orderDetailTypes);
         List<StudentPaymentOrderDetail> orderDetails4Instruments = orderDetails.stream()
                 .filter(e -> e.getType().equals(OrderDetailTypeEnum.MUSICAL))
-                .filter(e -> KitGroupPurchaseTypeEnum.GROUP.equals(e.getKitGroupPurchaseType())).collect(Collectors.toList());
+                .collect(Collectors.toList());
         if (orderDetails4Instruments.size() <= 0) {
             return false;
         }

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

@@ -441,7 +441,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 studentPaymentOrderDetail4goodsGroup.setPaymentOrderId(studentPaymentOrder.getId());
                 studentPaymentOrderDetail4goodsGroup.setKitGroupPurchaseType(goodsGroup.getKitGroupPurchaseType());
                 studentPaymentOrderDetailList.add(studentPaymentOrderDetail4goodsGroup);
-                if (OrderDetailTypeEnum.MUSICAL.equals(type) && KitGroupPurchaseTypeEnum.GROUP.equals(goodsGroup.getKitGroupPurchaseType())) {
+                if (OrderDetailTypeEnum.MUSICAL.equals(type)) {
                     maintenanceGoodsId = goodsGroup.getGoodsIdList();
                 }
             }
@@ -467,7 +467,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         }
         if (buyMaintenance) {
             if ("".equals(maintenanceGoodsId)) {
-                throw new BizException("团购乐器才能购买乐保，请核查");
+                throw new BizException("有乐器才能购买乐保，请核查");
             }
             BigDecimal maintenancePrice = new BigDecimal(sysConfigDao.findConfigValue("maintenance_price"));
             StudentPaymentOrderDetail maintenanceOrderDetail = new StudentPaymentOrderDetail();
@@ -566,7 +566,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 studentPaymentOrderDetail4goodsGroup.setPaymentOrderId(studentPaymentOrder.getId());
                 studentPaymentOrderDetail4goodsGroup.setKitGroupPurchaseType(goodsGroup.getKitGroupPurchaseType());
                 studentPaymentOrderDetailList.add(studentPaymentOrderDetail4goodsGroup);
-                if (OrderDetailTypeEnum.MUSICAL.equals(type) && KitGroupPurchaseTypeEnum.GROUP.equals(goodsGroup.getKitGroupPurchaseType())) {
+                if (OrderDetailTypeEnum.MUSICAL.equals(type)) {
                     maintenanceGoodsId = goodsGroup.getGoodsIdList();
                 }
             }
@@ -592,7 +592,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         }
         if (buyMaintenance) {
             if ("".equals(maintenanceGoodsId)) {
-                throw new BizException("团购乐器才能购买乐保，请核查");
+                throw new BizException("有乐器才能购买乐保，请核查");
             }
             BigDecimal maintenancePrice = new BigDecimal(sysConfigDao.findConfigValue("maintenance_price"));
             StudentPaymentOrderDetail maintenanceOrderDetail = new StudentPaymentOrderDetail();

mec-web/src/main/java/com/ym/mec/web/controller/StudentInstrumentController.java

@@ -137,7 +137,7 @@ public class StudentInstrumentController extends BaseController {
     @ApiOperation(value = "删除学生乐器信息")
     @PostMapping("/del")
     @PreAuthorize("@pcs.hasPermissions('studentInstrument/del')")
-    public HttpResponseResult<StudentInstrument> update(Long id, Integer studentId) {
+    public HttpResponseResult<StudentInstrument> del(Long id, Integer studentId) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");