|
@@ -194,6 +194,9 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
List<String> orderNoList = new ArrayList<String>();
|
|
|
|
|
|
for (StudentPaymentOrder payingOrder : payingOrders) {
|
|
|
+ if (payingOrder.getPaymentAccountNo() != null && payingOrder.getPaymentAccountNo().equals("205") && DateUtil.isSameDay(payingOrder.getCreateTime(), new Date())) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
if (payingOrder.getTransNo() == null) {
|
|
|
orderNoList.add(payingOrder.getOrderNo());
|
|
|
continue;
|
|
@@ -367,9 +370,9 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
subjectChangeService.orderCallback(order);
|
|
|
} else if (order.getType().equals(OrderTypeEnum.DEGREE_REGISTRATION)) {
|
|
|
degreeRegistrationService.updateStatus(order);
|
|
|
- }else if (order.getType().equals(OrderTypeEnum.MAINTENANCE)) {
|
|
|
+ } else if (order.getType().equals(OrderTypeEnum.MAINTENANCE)) {
|
|
|
studentInstrumentService.orderCallback(order);
|
|
|
- }else if (order.getType().equals(OrderTypeEnum.REPLACEMENT)) {
|
|
|
+ } else if (order.getType().equals(OrderTypeEnum.REPLACEMENT)) {
|
|
|
replacementInstrumentActivityService.orderCallback(order);
|
|
|
}
|
|
|
}
|
|
@@ -520,9 +523,9 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
public List<StudentPaymentOrderExportDto> getUserApplyOrders(Integer studentId, String musicGroupId) {
|
|
|
List<StudentPaymentOrderExportDto> orders = studentPaymentOrderDao.getUserApplyOrders(studentId, musicGroupId);
|
|
|
for (StudentPaymentOrderExportDto order : orders) {
|
|
|
- if(order.getOrderDetailList()==null) continue;
|
|
|
+ if (order.getOrderDetailList() == null) continue;
|
|
|
for (StudentPaymentOrderDetail studentPaymentOrderDetail : order.getOrderDetailList()) {
|
|
|
- if(studentPaymentOrderDetail.getGoodsList()==null) continue;
|
|
|
+ if (studentPaymentOrderDetail.getGoodsList() == null) continue;
|
|
|
|
|
|
String childGoodIds = "";
|
|
|
for (Goods goods : studentPaymentOrderDetail.getGoodsList()) {
|
|
@@ -530,7 +533,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
childGoodIds += StringUtils.isNotBlank(childGoodIds) ? "," : "" + goods.getComplementGoodsIdList();
|
|
|
}
|
|
|
}
|
|
|
- if(StringUtils.isNotBlank(childGoodIds)) {
|
|
|
+ if (StringUtils.isNotBlank(childGoodIds)) {
|
|
|
studentPaymentOrderDetail.setChildGoodsList(goodsDao.findGoodsByIds(childGoodIds));
|
|
|
}
|
|
|
}
|