后台消息推送修改

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

@@ -532,7 +532,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                 && !(o.getType() == PRACTICE)
                 && !(o.getType() == MAINTENANCE)
                 && !(o.getType() == CLOUD_TEACHER)
-                && !(o.getType() == CLOUD_TEACHER)
+                && !(o.getType() == CLOUD_TEACHER_PLUS)
                 && !(o.getType() == ACCESSORIES))
                 .map(o -> o.getPrice().subtract(o.getRemitFee() == null ? BigDecimal.ZERO : o.getRemitFee()))
                 .reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -607,6 +607,10 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
 
     @Override
     public List<StudentPaymentOrderDetail> findByOrderId(Long paymentOrderId) {
-        return studentPaymentOrderDetailDao.findByOrderId(paymentOrderId);
+        List<StudentPaymentOrderDetail> paymentOrderDetails = studentPaymentOrderDetailDao.findByOrderId(paymentOrderId);
+        for (StudentPaymentOrderDetail paymentOrderDetail : paymentOrderDetails) {
+            paymentOrderDetail.setGoodsList(goodsService.findGoodsByIds(paymentOrderDetail.getGoodsIdList()));
+        }
+        return paymentOrderDetails;
     }
 }