Merge branch 'zx_saas_director_0927' of http://git.dayaedu.com/yonge/mec into test

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

@@ -305,11 +305,15 @@ public class TempDirectorTrainingCampDetailServiceImpl extends ServiceImpl<TempD
             }
         }
         TempDirectorTrainingCampDetail campDetail = this.getById(studentPaymentOrder.getMusicGroupId());
-        campDetail.setPaymentAmount(studentPaymentOrder.getActualAmount());
-        campDetail.setPaymentDate(studentPaymentOrder.getPayTime());
         switch (studentPaymentOrder.getStatus()){
             case SUCCESS:
+                campDetail.setPaymentAmount(studentPaymentOrder.getActualAmount());
+                campDetail.setPaymentDate(studentPaymentOrder.getPayTime());
                 campDetail.setPaymentStatus("PAID");
+                TempDirectorTrainingCamp trainingCamp = tempDirectorTrainingCampService.getById(campDetail.getTempDirectorTrainingCampId());
+                if(trainingCamp.getBirdPrice() != null && trainingCamp.getBirdPriceEndDate() != null && trainingCamp.getBirdPriceEndDate().after(studentPaymentOrder.getCreateTime())){
+                    campDetail.setBirdFlag(true);
+                }
                 break;
             case FAILED:
             case CLOSE: