Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -11,12 +13,15 @@ public class VipGroupDefaultClassesCycle {
 	private Integer id;
 	
 	/** 最小课次 */
+	@ApiModelProperty(value = "最小课次",required = false)
 	private Integer minClassTimes;
 	
 	/** 最大课次 */
+	@ApiModelProperty(value = "最大课次",required = false)
 	private Integer maxClassTimes;
 	
 	/** 最大排课范围（月份） */
+	@ApiModelProperty(value = "最大排课范围（月份）",required = false)
 	private Integer month;
 	
 	/**  */

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

@@ -1,5 +1,9 @@
 package com.ym.mec.biz.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -10,17 +14,17 @@ public class VipGroupDefaultClassesUnitPrice {
 	/**  */
 	private Integer id;
 	
-	/**  */
+	@ApiModelProperty(value = "所属分部",required = false)
 	private Integer organId;
 	
-	/**  */
+	@ApiModelProperty(value = "类别",required = false)
 	private Integer vipGroupCategoryId;
 	
-	/**  */
-	private long onlineClassesUnitPrice;
+	@ApiModelProperty(value = "线上课单价",required = false)
+	private BigDecimal onlineClassesUnitPrice;
 	
-	/**  */
-	private long offlineClassesUnitPrice;
+	@ApiModelProperty(value = "线下课单价",required = false)
+	private BigDecimal offlineClassesUnitPrice;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -52,19 +56,19 @@ public class VipGroupDefaultClassesUnitPrice {
 		return this.vipGroupCategoryId;
 	}
 			
-	public void setOnlineClassesUnitPrice(long onlineClassesUnitPrice){
+	public void setOnlineClassesUnitPrice(BigDecimal onlineClassesUnitPrice){
 		this.onlineClassesUnitPrice = onlineClassesUnitPrice;
 	}
 	
-	public long getOnlineClassesUnitPrice(){
+	public BigDecimal getOnlineClassesUnitPrice(){
 		return this.onlineClassesUnitPrice;
 	}
 			
-	public void setOfflineClassesUnitPrice(long offlineClassesUnitPrice){
+	public void setOfflineClassesUnitPrice(BigDecimal offlineClassesUnitPrice){
 		this.offlineClassesUnitPrice = offlineClassesUnitPrice;
 	}
 	
-	public long getOfflineClassesUnitPrice(){
+	public BigDecimal getOfflineClassesUnitPrice(){
 		return this.offlineClassesUnitPrice;
 	}
 			

mec-education/src/main/java/com/ym/mec/education/service/impl/ClassGroupStudentMapperServiceImpl.java

@@ -21,6 +21,7 @@ import com.ym.mec.education.service.ISysUserService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -66,8 +67,9 @@ public class ClassGroupStudentMapperServiceImpl extends ServiceImpl<ClassGroupSt
                 musicGroupStudentFeeQueryWrapper.lambda().eq(true, MusicGroupStudentFee::getMusicGroupId, classGroup.getMusicGroupId())
                         .eq(true, MusicGroupStudentFee::getUserId, item.getUserId());
                 MusicGroupStudentFee musicGroupStudentFee = musicGroupStudentFeeService.getOne(musicGroupStudentFeeQueryWrapper);
-                Optional.of(musicGroupStudentFee).ifPresent(groupStudentFee -> studentRegistrationResp.
-                        setStudentAttendance("连续缺到" + groupStudentFee.getContinuousAbsenteeismTimes() + "次"));
+                if (Objects.nonNull(musicGroupStudentFee) && Objects.nonNull(musicGroupStudentFee.getContinuousAbsenteeismTimes())) {
+                    studentRegistrationResp.setStudentAttendance("连续缺到" + musicGroupStudentFee.getContinuousAbsenteeismTimes() + "次");
+                }
             }
             list.add(studentRegistrationResp);
         });

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

@@ -17,7 +17,7 @@ import com.ym.mec.biz.service.VipGroupCategoryService;
 import com.ym.mec.common.controller.BaseController;
 
 @Api(tags = "vip课类别")
-@RequestMapping("VipGroupCategory")
+@RequestMapping("vipGroupCategory")
 @RestController
 public class VipGroupCategoryController extends BaseController {
 

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

@@ -0,0 +1,65 @@
+package com.ym.mec.web.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.Date;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesCycle;
+import com.ym.mec.biz.service.VipGroupDefaultClassesCycleService;
+import com.ym.mec.common.controller.BaseController;
+
+@Api(tags = "vip课默认排课周期")
+@RequestMapping("vipGroupDefaultClassesCycle")
+@RestController
+public class VipGroupDefaultClassesCycleController extends BaseController {
+
+	@Autowired
+	private VipGroupDefaultClassesCycleService vipGroupDefaultClassesCycleService;
+
+	@ApiOperation("单查询")
+	@GetMapping(value = "/query", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	public Object query(int id) {
+		return succeed(vipGroupDefaultClassesCycleService.get(id));
+	}
+
+	@ApiOperation("全查询")
+	@GetMapping(value = "/queryAll", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	public Object queryAll() {
+		return succeed(vipGroupDefaultClassesCycleService.findAll(null));
+	}
+
+	@ApiOperation("新增")
+	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	public Object add(VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle) {
+		Date date = new Date();
+		vipGroupDefaultClassesCycle.setCreateTime(date);
+		vipGroupDefaultClassesCycle.setUpdateTime(date);
+		vipGroupDefaultClassesCycleService.insert(vipGroupDefaultClassesCycle);
+		return succeed();
+	}
+
+	@ApiOperation("修改")
+	@PostMapping(value = "/update", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	public Object update(VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle) {
+		Date date = new Date();
+		vipGroupDefaultClassesCycle.setUpdateTime(date);
+		vipGroupDefaultClassesCycleService.update(vipGroupDefaultClassesCycle);
+		return succeed();
+	}
+
+	@ApiOperation("删除")
+	@PostMapping(value = "/delete", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	public Object delete(int id) {
+		vipGroupDefaultClassesCycleService.delete(id);
+		return succeed();
+	}
+
+}

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

@@ -0,0 +1,65 @@
+package com.ym.mec.web.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.Date;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesUnitPrice;
+import com.ym.mec.biz.service.VipGroupDefaultClassesUnitPriceService;
+import com.ym.mec.common.controller.BaseController;
+
+@Api(tags = "vip课默认单价")
+@RequestMapping("vipGroupDefaultClassesUnitPrice")
+@RestController
+public class VipGroupDefaultClassesUnitPriceController extends BaseController {
+
+	@Autowired
+	private VipGroupDefaultClassesUnitPriceService vipGroupDefaultClassesUnitPriceService;
+
+	@ApiOperation("单查询")
+	@GetMapping(value = "/query", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	public Object query(int id) {
+		return succeed(vipGroupDefaultClassesUnitPriceService.get(id));
+	}
+
+	@ApiOperation("全查询")
+	@GetMapping(value = "/queryAll", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	public Object queryAll() {
+		return succeed(vipGroupDefaultClassesUnitPriceService.findAll(null));
+	}
+
+	@ApiOperation("新增")
+	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	public Object add(VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice) {
+		Date date = new Date();
+		vipGroupDefaultClassesUnitPrice.setCreateTime(date);
+		vipGroupDefaultClassesUnitPrice.setUpdateTime(date);
+		vipGroupDefaultClassesUnitPriceService.insert(vipGroupDefaultClassesUnitPrice);
+		return succeed();
+	}
+
+	@ApiOperation("修改")
+	@PostMapping(value = "/update", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	public Object update(VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice) {
+		Date date = new Date();
+		vipGroupDefaultClassesUnitPrice.setUpdateTime(date);
+		vipGroupDefaultClassesUnitPriceService.update(vipGroupDefaultClassesUnitPrice);
+		return succeed();
+	}
+
+	@ApiOperation("删除")
+	@PostMapping(value = "/delete", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	public Object delete(int id) {
+		vipGroupDefaultClassesUnitPriceService.delete(id);
+		return succeed();
+	}
+
+}