Browse Source

订单状态查询中加,审核状态

river 4 years ago
parent
commit
d5c4e78f8a

+ 9 - 0
mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -91,6 +91,8 @@ public class StudentOrderController extends BaseController {
     private ReplacementInstrumentActivityDao replacementInstrumentActivityDao;
     @Autowired
     private ChildrenDayDegreeDetailDao childrenDayDegreeDetailDao;
+    @Autowired
+    private StudentRegistrationDao studentRegistrationDao;
 
 
     @Value("${spring.profiles.active:dev}")
@@ -140,6 +142,13 @@ public class StudentOrderController extends BaseController {
         HashMap<String, Object> orderDetail = new HashMap<>();
         orderDetail.put("order", orderByOrderNo);
         orderDetail.put("groupType", orderByOrderNo.getGroupType());
+        if(OrderTypeEnum.APPLY.equals(orderByOrderNo.getType())){
+            StudentRegistration studentRegistration = studentRegistrationDao.queryByUserIdAndMusicGroupId(orderByOrderNo.getUserId(), orderByOrderNo.getMusicGroupId());
+            if(studentRegistration.getPayingStatus().equals(2)) {
+                orderDetail.put("payingStatus",studentRegistration.getPayingStatus());
+            }
+        }
+
         if (orderByOrderNo.getGroupType().equals(GroupType.MUSIC)) {
             MusicGroup musicGroup = musicGroupService.get(orderByOrderNo.getMusicGroupId());
             List<Goods> goodsList = studentPaymentOrderDetailService.findApplyOrderGoods(orderByOrderNo.getId());