订单回调接口加上chargeTypeId

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupPaymentCalender.java

@@ -16,6 +16,14 @@ import com.ym.mec.common.enums.BaseEnum;
  */
 public class MusicGroupPaymentCalender {
 
+	public Integer getChargeTypeId() {
+		return chargeTypeId;
+	}
+
+	public void setChargeTypeId(Integer chargeTypeId) {
+		this.chargeTypeId = chargeTypeId;
+	}
+
 	public enum PaymentCalenderStatusEnum implements BaseEnum<String, PaymentCalenderStatusEnum> {
 		AUDITING("审核中"), REJECT("拒绝"), NO("未开启缴费"), OPEN("开启缴费"), OVER("缴费已结束"), PAID("已缴费");
 
@@ -140,6 +148,9 @@ public class MusicGroupPaymentCalender {
 	@ApiModelProperty(value = "批次号", required = false)
 	private String batchNo;
 
+	@ApiModelProperty(value = "chargeTypeId", required = false)
+	private Integer chargeTypeId;
+
 	public String getAuditMemo() {
 		return auditMemo;
 	}

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

@@ -83,6 +83,10 @@ public class StudentOrderController extends BaseController {
     private DegreeRegistrationDao degreeRegistrationDao;
     @Autowired
     private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
+    @Autowired
+    private MusicGroupPaymentCalenderCourseSettingsDao musicGroupPaymentCalenderCourseSettingsDao;
 
 
     @Value("${spring.profiles.active:dev}")
@@ -144,6 +148,14 @@ public class StudentOrderController extends BaseController {
             orderDetail.put("ownershipType", musicGroup.getOwnershipType());
             orderDetail.put("detailType", orderDetailType);
             orderDetail.put("chargeTypeId", musicGroup.getChargeTypeId());
+
+            //新的课程形态10.27
+            MusicGroupPaymentCalender musicGroupRegCalender = musicGroupPaymentCalenderDao.getMusicGroupRegCalender(musicGroup.getId());
+            if (musicGroupRegCalender != null) {
+                List<MusicGroupPaymentCalenderCourseSettings> courseSettings = musicGroupPaymentCalenderCourseSettingsDao.getMusicGroupRegCalenderCourseSettings(musicGroup.getId());
+                musicGroupRegCalender.setMusicGroupPaymentCalenderCourseSettingsList(courseSettings);
+            }
+            orderDetail.put("calender", musicGroupRegCalender);
         } else if (orderByOrderNo.getGroupType().equals(GroupType.VIP)) {
             VipBuyResultDto vipBuyResultInfo = vipGroupService.findVipBuyResultInfo(Integer.valueOf(orderByOrderNo.getMusicGroupId()));
             orderDetail.put("detail", vipBuyResultInfo);
@@ -333,7 +345,7 @@ public class StudentOrderController extends BaseController {
 
         String[] statusArr = {"0", "1", "7"};
         for (StudentPaymentOrder payingOrder : payingOrders) {
-            if(StringUtils.isNotBlank(orderNo)&&!orderNo.equals(payingOrder.getOrderNo())){
+            if (StringUtils.isNotBlank(orderNo) && !orderNo.equals(payingOrder.getOrderNo())) {
                 continue;
             }
             Map<String, String> rpMap = new HashMap<>();
@@ -774,5 +786,17 @@ public class StudentOrderController extends BaseController {
         return succeed(studentPaymentOrderService.reConfirmOrder(startTime, endTime));
     }
 
+    @GetMapping("/getMusicGroupApplyCalender")
+    public HttpResponseResult<MusicGroupPaymentCalender> getMusicGroupApplyCalender(String musicGroupId){
+        MusicGroupPaymentCalender musicGroupRegCalender = musicGroupPaymentCalenderDao.getMusicGroupRegCalender(musicGroupId);
+        if (musicGroupRegCalender != null) {
+            MusicGroup musicGroup = musicGroupService.get(musicGroupId);
+            musicGroupRegCalender.setChargeTypeId(musicGroup.getChargeTypeId());
+            List<MusicGroupPaymentCalenderCourseSettings> courseSettings = musicGroupPaymentCalenderCourseSettingsDao.getMusicGroupRegCalenderCourseSettings(musicGroupId);
+            musicGroupRegCalender.setMusicGroupPaymentCalenderCourseSettingsList(courseSettings);
+        }
+        return succeed(musicGroupRegCalender);
+    }
+
 
 }