涉及乐团id类型修改

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/HighClassGroupDto.java

@@ -20,10 +20,10 @@ public class HighClassGroupDto extends ClassGroup {
 	private String dayOfWeek;
 
 	@ApiModelProperty(value = "开始时间",required = true)
-	private Date startClassTime;
+	private String startClassTime;
 
 	@ApiModelProperty(value = "结束时间",required = true)
-	private Date endClassTime;
+	private String endClassTime;
 
 	@ApiModelProperty(value = "开始日期", required = true)
 	private Date StartDate;
@@ -41,19 +41,19 @@ public class HighClassGroupDto extends ClassGroup {
 		this.userId = userId;
 	}
 
-	public Date getStartClassTime() {
+	public String getStartClassTime() {
 		return startClassTime;
 	}
 
-	public void setStartClassTime(Date startClassTime) {
+	public void setStartClassTime(String startClassTime) {
 		this.startClassTime = startClassTime;
 	}
 
-	public Date getEndClassTime() {
+	public String getEndClassTime() {
 		return endClassTime;
 	}
 
-	public void setEndClassTime(Date endClassTime) {
+	public void setEndClassTime(String endClassTime) {
 		this.endClassTime = endClassTime;
 	}
 

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.entity;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 
+import com.ym.mec.biz.dal.enums.PaymentChannelTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -79,6 +80,10 @@ public class StudentPaymentOrder {
 	private Integer version;
 
 	private Date payTime;
+
+	private Integer accountId;
+
+	private PaymentChannelTypeEnum paymentChannelType;
 	
 	public void setId(Long id){
 		this.id = id;
@@ -223,6 +228,21 @@ public class StudentPaymentOrder {
 	public void setPayTime(Date payTime) {
 		this.payTime = payTime;
 	}
+    public Integer getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(Integer accountId) {
+        this.accountId = accountId;
+    }
+
+    public PaymentChannelTypeEnum getPaymentChannelType() {
+        return paymentChannelType;
+    }
+
+    public void setPaymentChannelType(PaymentChannelTypeEnum paymentChannelType) {
+        this.paymentChannelType = paymentChannelType;
+    }
 
 	@Override
 	public String toString() {

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/PaymentChannelTypeEnum.java

@@ -0,0 +1,26 @@
+package com.ym.mec.biz.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+public enum PaymentChannelTypeEnum implements BaseEnum<String, PaymentChannelTypeEnum> {
+	PER("PER", "个人"), COM("com", "公司");
+
+	private String code;
+
+	private String desc;
+
+	private PaymentChannelTypeEnum(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	@Override
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

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

@@ -218,12 +218,14 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     CourseSchedule courseSchedule = new CourseSchedule();
                     Instant instant = now.atZone(ZoneId.systemDefault()).toInstant();
                     Date classDate = Date.from(instant);
+                    String startClassTime = DateUtil.getDate(classDate) + " " + highClassGroup.getStartClassTime();
+                    String endClassTime = DateUtil.getDate(classDate) + " " + highClassGroup.getEndClassTime();
 
                     courseSchedule.setClassGroupId(highClassGroup.getUserId());
                     courseSchedule.setStatus(CourseStatusEnum.NOT_START);
                     courseSchedule.setClassDate(classDate);
-                    courseSchedule.setStartClassTime(highClassGroup.getStartClassTime());
-                    courseSchedule.setEndClassTime(highClassGroup.getEndClassTime());
+                    courseSchedule.setStartClassTime(DateUtil.stringToDate(startClassTime));
+                    courseSchedule.setEndClassTime(DateUtil.stringToDate(endClassTime));
                     courseSchedule.setTeacherId(highClassGroup.getUserId().longValue());
                     courseSchedule.setActualTeacherId(highClassGroup.getUserId().longValue());
                     courseSchedule.setCreateTime(date);

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

@@ -68,6 +68,11 @@ public class PayServiceImpl implements PayService {
     }
 
 
+    /**
+     * 获取收款的账户
+     * @param money
+     * @return
+     */
     private SysAccount getRoutingAccount(BigDecimal money) {
         SysAccount routingAccount = null;
         int payOrderNums = studentPaymentOrderService.findPayOrderNum(); //获取支付中和成功的订单数

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

@@ -439,7 +439,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         //失败减去已收款金额
 
         //减去缴费人数
-        if (studentPaymentOrder.getStatus().equals(DealStatusEnum.SUCCESS)) {
+        if (studentPaymentOrder.getStatus().equals(DealStatusEnum.FAilED)) {
             MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId());
             musicOneSubjectClassPlan.setPaidStudentNum(musicOneSubjectClassPlan.getPaidStudentNum() - 1);
             musicGroupSubjectPlanService.update(musicOneSubjectClassPlan);

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

@@ -2,7 +2,6 @@ package com.ym.mec.student.controller;
 
 import com.ym.mec.biz.dal.dao.SysAccountDao;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
-import com.ym.mec.biz.dal.entity.SysAccount;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import com.ym.mec.biz.service.StudentPaymentOrderService;
@@ -12,14 +11,11 @@ import io.swagger.annotations.Api;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Map;
-
 @RequestMapping("studentOrder")
 @Api(tags = "订单回调")
 @RestController
@@ -34,7 +30,7 @@ public class StudentOrderController {
 
 
     @PostMapping("/notify")
-    public String notify(NotifyMsg notifyMsg) {
+    public String notify(@ModelAttribute NotifyMsg notifyMsg) {
         //       ArrayList<SysAccount> sysAccounts = new ArrayList<>();
 //       Map<String,String[]> msg = request.getParameterMap();
 //        for (Map.Entry<String, String[]> stringObjectEntry : msg.entrySet()) {

mec-web/src/main/java/com/ym/mec/web/controller/ClassGroupController.java

@@ -49,7 +49,8 @@ public class ClassGroupController extends BaseController {
     @ApiOperation(value = "新增提高班")
     @PostMapping("/addHighClass")
     @PreAuthorize("@pcs.hasPermissions('classGroup/addHighClass')")
-    public Object addHighClass(@ApiParam(value = "乐团提高班json", required = true) @RequestParam List<HighClassGroupDto> highClassGroupDtoList) throws Exception {
+    @ApiParam(value = "乐团提高班json", required = true)
+    public Object addHighClass(@RequestBody List<HighClassGroupDto> highClassGroupDtoList) throws Exception {
         if (highClassGroupDtoList.size() <= 0) {
             return failed("参数不合法");
         }