|
@@ -416,7 +416,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();
|
|
|
}
|
|
|
}
|
|
@@ -442,7 +442,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();
|
|
@@ -541,7 +541,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();
|
|
|
}
|
|
|
}
|
|
@@ -567,7 +567,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();
|