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

cms/src/main/java/com/ym/mec/cms/service/impl/SysNewsInformationServiceImpl.java

@@ -33,7 +33,7 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 	
 	@Autowired
 	private WebFeignService webFeignService;
-	
+
 	@Value("${cms.server.context.path}")
 	private String serverContextPath;
 	
@@ -167,4 +167,4 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 		return pageInfo;
 	}
 
-}
+}

cms/src/main/resources/application.yml

@@ -76,4 +76,10 @@ management:
 
 ribbon:  
     ReadTimeout: 60000  
-    ConnectTimeout: 60000
+    ConnectTimeout: 60000
+
+
+cms:
+  server:
+    context:
+      path: http://admin.dayaedu.com/

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/DegreeRegistrationDao.java

@@ -4,10 +4,14 @@ import com.ym.mec.biz.dal.entity.DegreeRegistration;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 public interface DegreeRegistrationDao extends BaseDAO<Integer, DegreeRegistration> {
 
     DegreeRegistration findByMobileAndSporadicId(@Param("mobile") String mobile, @Param("sporadicId") Integer sporadicId);
 
     DegreeRegistration getLock(@Param("id") Integer id);
 
+    DegreeRegistration getTotalAmount(Map<String, Object> params);
 }

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

@@ -0,0 +1,53 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.common.page.PageInfo;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+public class PageInfoDegree<T> extends PageInfo<T> {
+
+    @ApiModelProperty(value = "考级费用总额", required = true)
+    private BigDecimal subjectLevelAmount =BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "乐理考级总额", required = true)
+    private BigDecimal theoryLevelAmount =BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "考级总金额", required = true)
+    private BigDecimal totalAmount = BigDecimal.ZERO;
+
+    public PageInfoDegree() {
+    }
+
+    public PageInfoDegree(Integer pageNo) {
+        super(pageNo);
+    }
+
+    public PageInfoDegree(Integer pageNo, int pageSize) {
+        super(pageNo, pageSize);
+    }
+
+    public BigDecimal getSubjectLevelAmount() {
+        return subjectLevelAmount;
+    }
+
+    public void setSubjectLevelAmount(BigDecimal subjectLevelAmount) {
+        this.subjectLevelAmount = subjectLevelAmount;
+    }
+
+    public BigDecimal getTheoryLevelAmount() {
+        return theoryLevelAmount;
+    }
+
+    public void setTheoryLevelAmount(BigDecimal theoryLevelAmount) {
+        this.theoryLevelAmount = theoryLevelAmount;
+    }
+
+    public BigDecimal getTotalAmount() {
+        return totalAmount;
+    }
+
+    public void setTotalAmount(BigDecimal totalAmount) {
+        this.totalAmount = totalAmount;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/service/DegreeRegistrationService.java

@@ -1,6 +1,10 @@
 package com.ym.mec.biz.service;
 
+import com.ym.mec.biz.dal.dto.PageInfoDegree;
+import com.ym.mec.biz.dal.dto.PageInfoOrder;
 import com.ym.mec.biz.dal.entity.DegreeRegistration;
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
+import com.ym.mec.biz.dal.page.DegreeQueryInfo;
 import com.ym.mec.common.service.BaseService;
 
 import java.util.Map;
@@ -10,4 +14,6 @@ public interface DegreeRegistrationService extends BaseService<Integer, DegreeRe
     Map pay(DegreeRegistration degreeRegistration) throws Exception;
 
     Boolean updateStatus(Integer id , Integer status);
+
+    PageInfoDegree<DegreeRegistration> getPageList(DegreeQueryInfo queryInfo);
 }

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

@@ -3,18 +3,22 @@ package com.ym.mec.biz.service.impl;
 import com.ym.mec.biz.dal.dao.DegreeRegistrationDao;
 import com.ym.mec.biz.dal.dao.SporadicChargeInfoDao;
 import com.ym.mec.biz.dal.dao.SysConfigDao;
+import com.ym.mec.biz.dal.dto.PageInfoDegree;
+import com.ym.mec.biz.dal.dto.PageInfoOrder;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
+import com.ym.mec.biz.dal.enums.SporadicChargeTypeEnum;
+import com.ym.mec.biz.dal.page.DegreeQueryInfo;
 import com.ym.mec.biz.service.DegreeRegistrationService;
 import com.ym.mec.biz.service.PayService;
 import com.ym.mec.biz.service.StudentPaymentOrderService;
-import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.util.collection.MapUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -58,22 +62,22 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         if (chargeInfo == null) {
             throw new BizException("你选的考试级别不存在");
         }
-        if(chargeInfo.getTitle().equals("二级") && StringUtils.isBlank(degreeRegistration.getTheoryCert())){
-            throw new BizException(chargeInfo.getTitle()+"考试必须上传证书");
+        if (chargeInfo.getTitle().equals("二级") && StringUtils.isBlank(degreeRegistration.getTheoryCert())) {
+            throw new BizException(chargeInfo.getTitle() + "考试必须上传证书");
         }
         degreeRegistration.setLevel(chargeInfo.getTitle());
         BigDecimal theoryMoney = BigDecimal.ZERO;
-        if(degreeRegistration.getTheoryLevel().equals("一级")){
+        if (degreeRegistration.getTheoryLevel().equals("一级")) {
             theoryMoney = new BigDecimal(200);
-        }else if(degreeRegistration.getTheoryLevel().equals("二级")){
+        } else if (degreeRegistration.getTheoryLevel().equals("二级")) {
             theoryMoney = new BigDecimal(240);
-        }else if(degreeRegistration.getTheoryLevel().equals("三级")){
+        } else if (degreeRegistration.getTheoryLevel().equals("三级")) {
             theoryMoney = new BigDecimal(280);
-        }else if(degreeRegistration.getTheoryLevel().equals("四级")){
+        } else if (degreeRegistration.getTheoryLevel().equals("四级")) {
             theoryMoney = new BigDecimal(320);
-        }else if(degreeRegistration.getTheoryLevel().equals("免考")){
+        } else if (degreeRegistration.getTheoryLevel().equals("免考")) {
 
-        }else {
+        } else {
             throw new BizException("您选择的乐理级别不存在，请核对");
         }
         degreeRegistration.setTheoryMoney(theoryMoney);
@@ -84,9 +88,9 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             degreeRegistration.setCreateTime(nowDate);
             degreeRegistration.setUpdateTime(nowDate);
             degreeRegistrationDao.insert(degreeRegistration);
-        }else if (degree.getStatus().equals(2)){
-           throw  new BizException("您本次已报名，请勿重复报名");
-        }else {
+        } else if (degree.getStatus().equals(2)) {
+            throw new BizException("您本次已报名，请勿重复报名");
+        } else {
             degreeRegistration.setId(degree.getId());
             degreeRegistration.setStatus(1);
             degreeRegistration.setUpdateTime(nowDate);
@@ -95,7 +99,6 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         degreeRegistrationDao.getLock(degreeRegistration.getId());
 
 
-
         BigDecimal amount = chargeInfo.getAmount();
         amount = amount.add(theoryMoney);
 
@@ -115,8 +118,8 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         studentPaymentOrder.setMusicGroupId(degreeRegistration.getSporadicId().toString());
         studentPaymentOrder.setOrganId(chargeInfo.getOrganId());
         studentPaymentOrder.setRoutingOrganId(chargeInfo.getOrganId());
-        if(theoryMoney.compareTo(BigDecimal.ZERO) >0){
-            studentPaymentOrder.setMemo("乐理"+degreeRegistration.getTheoryLevel()+",费用："+theoryMoney);
+        if (theoryMoney.compareTo(BigDecimal.ZERO) > 0) {
+            studentPaymentOrder.setMemo("乐理" + degreeRegistration.getTheoryLevel() + ",费用：" + theoryMoney);
         }
         studentPaymentOrderService.insert(studentPaymentOrder);
         studentPaymentOrder.setVersion(0);
@@ -178,4 +181,30 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         }
         return true;
     }
+
+    @Override
+    public PageInfoDegree<DegreeRegistration> getPageList(DegreeQueryInfo queryInfo) {
+        PageInfoDegree<DegreeRegistration> pageInfo = new PageInfoDegree<>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<String, Object>();
+        MapUtil.populateMap(params, queryInfo);
+
+        List<DegreeRegistration> dataList = new ArrayList<>();
+        int count = this.findCount(params);
+
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = degreeRegistrationDao.queryPage(params);
+            DegreeRegistration degree = degreeRegistrationDao.getTotalAmount(params);
+            BigDecimal subjectLevelAmount = degree.getMoney() == null ? BigDecimal.ZERO : degree.getMoney();
+            BigDecimal theoryLevelAmount = degree.getTheoryMoney() == null ? BigDecimal.ZERO : degree.getTheoryMoney();
+            BigDecimal totalAmount = subjectLevelAmount.add(theoryLevelAmount);
+
+            pageInfo.setSubjectLevelAmount(subjectLevelAmount);
+            pageInfo.setTheoryLevelAmount(theoryLevelAmount);
+            pageInfo.setTotalAmount(totalAmount);
+        }
+        pageInfo.setRows(dataList);
+        return pageInfo;
+    }
 }

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

@@ -1058,6 +1058,16 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				throw new BizException("您无法购买此课程");
 			}
 		}
+
+		ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroupId.longValue(), null);
+
+		if(classGroup.getStudentNum()>0&&(VipGroupStatusEnum.APPLYING.equals(vipGroup.getStatus()))){
+			int i = studentPaymentOrderDao.countGroupOrderWithoutFailed(vipGroupId.toString(), GroupType.VIP);
+			if(i<=0){
+				throw new BizException("该课程已经无法通过购买加入，请联系教务老师!");
+			}
+		}
+
 		List<CourseSchedule> courseSchedules = JSON.parseArray(vipGroup.getCourseSchedulesJson(),CourseSchedule.class);
 		courseScheduleService.checkNewCourseSchedules(courseSchedules,false);
 	}
@@ -1171,10 +1181,10 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         VipGroup vipGroup = vipGroupDao.get(vipGroupBuyParams.getVipGroupId());
 
 
-		if(classGroup.getStudentNum()>1&&(VipGroupStatusEnum.APPLYING.equals(vipGroup.getStatus()))){
+		if(classGroup.getStudentNum()>0&&(VipGroupStatusEnum.APPLYING.equals(vipGroup.getStatus()))){
 			int i = studentPaymentOrderDao.countGroupOrderWithoutFailed(vipGroupBuyParams.getVipGroupId().toString(), GroupType.VIP);
 			if(i<=0){
-				throw new BizException("VIP课程存在手动添加用户，无法进行购买!");
+				throw new BizException("该课程已经无法通过购买加入，请联系教务老师!");
 			}
 		}
 
@@ -2484,10 +2494,10 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroupId, null);
 
-		if(classGroup.getStudentNum()>1&&(VipGroupStatusEnum.APPLYING.equals(vipGroup.getStatus()))){
+		if(classGroup.getStudentNum()>0&&(VipGroupStatusEnum.APPLYING.equals(vipGroup.getStatus()))){
 			int i = studentPaymentOrderDao.countGroupOrderWithoutFailed(vipGroupId.toString(), GroupType.VIP);
 			if(i>0){
-				throw new BizException("VIP课程存在购买用户，无法进行添加学员操作!");
+				throw new BizException("该课程组学员为购买加入，无法添加学员加入，请走学员走购买流程!");
 			}
 		}
 

mec-biz/src/main/resources/config/mybatis/DegreeRegistrationMapper.xml

@@ -92,6 +92,11 @@
         <include refid="queryPageSql"/>
     </select>
 
+    <select id="getTotalAmount" parameterType="map" resultMap="DegreeRegistration">
+        SELECT SUM(money_) money_ ,SUM(theory_money_) theory_money_ FROM degree_registration
+        <include refid="queryPageSql"/>
+    </select>
+
     <delete id="delete" parameterType="java.lang.Integer">
         delete
         from degree_registration

mec-web/src/main/java/com/ym/mec/web/config/ResourceServerConfig.java

@@ -24,10 +24,17 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 
 	@Override
 	public void configure(HttpSecurity http) throws Exception {
-		http.csrf().disable().exceptionHandling().accessDeniedHandler(baseAccessDeniedHandler).authenticationEntryPoint(baseAuthenticationEntryPoint).and()
-				.authorizeRequests().antMatchers("/task/**").hasIpAddress("0.0.0.0/0")
-				.antMatchers("/v2/api-docs", "/classGroup/highClassGroups", "/code/*", "/api/*", "/appVersionInfo/queryByPlatform").permitAll().anyRequest()
-				.authenticated().and().httpBasic();
+		http.csrf()
+				.disable()
+				.exceptionHandling()
+				.accessDeniedHandler(baseAccessDeniedHandler)
+				.authenticationEntryPoint(baseAuthenticationEntryPoint)
+				.and()
+				.authorizeRequests()
+				.antMatchers("/task/**")
+				.hasIpAddress("0.0.0.0/0")
+				.antMatchers("/v2/api-docs", "/classGroup/highClassGroups", "/code/*", "/api/*", "/appVersionInfo/queryByPlatform", "/eduDegree/*",
+						"/uploadFile").permitAll().anyRequest().authenticated().and().httpBasic();
 	}
 
 	@Override

mec-web/src/main/java/com/ym/mec/web/config/WebMvcConfig.java

@@ -1,44 +1,17 @@
 package com.ym.mec.web.config;
 
-import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
 import org.springframework.format.FormatterRegistry;
 import org.springframework.http.MediaType;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
 import com.ym.mec.common.config.EnumConverterFactory;
 import com.ym.mec.common.config.LocalFastJsonHttpMessageConverter;
-import com.ym.mec.common.enums.BaseEnum;
 
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {

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

@@ -7,8 +7,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -32,7 +30,6 @@ public class UploadFileController extends BaseController {
 	private UploadFileService uploadFileService;
 
 	@PostMapping(value = "uploadFile")
-	@PreAuthorize("@pcs.hasPermissions('uploadFile','system')")
 	public Object uploadFile(@ApiParam(value = "上传的文件", required = true) @RequestParam("file") MultipartFile file) {
 		try {
 			if (file != null && StringUtils.isNotBlank(file.getOriginalFilename())) {

mec-web/src/main/java/com/ym/mec/web/controller/education/DegreeController.java → mec-web/src/main/java/com/ym/mec/web/controller/education/EduDegreeController.java

@@ -29,10 +29,10 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
 
-@RequestMapping("degree")
+@RequestMapping("eduDegree")
 @Api(tags = "级报名服务")
 @RestController
-public class DegreeController extends BaseController {
+public class EduDegreeController extends BaseController {
 
     @Autowired
     private StudentPaymentOrderService studentPaymentOrderService;
@@ -54,7 +54,7 @@ public class DegreeController extends BaseController {
     @GetMapping("/queryPage")
     public HttpResponseResult queryPage(DegreeQueryInfo queryInfo) {
         queryInfo.setStatus(2);
-        return succeed(degreeRegistrationService.queryPage(queryInfo));
+        return succeed(degreeRegistrationService.getPageList(queryInfo));
     }
 
 }