Merge branch 'feature/0406-degree' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -16,8 +16,6 @@ import java.util.Set;
 
 public interface DegreeRegistrationService extends BaseService<Integer, DegreeRegistration> {
 
-    String ACTIVITY_TAG = "DEGREE_REGISTRATION_2020_12";
-
     HttpResponseResult pay(DegreeRegistrationActivityDto degreeRegistration) throws Exception;
 
     Boolean updateStatus(StudentPaymentOrder order);

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

@@ -164,7 +164,7 @@ public class DegreeLevelFeeServiceImpl extends ServiceImpl<DegreeLevelFeeMapper,
         DegreeLevelFeeNew degreeLevelFeeNew = degreeLevelFees.get(0);
         Integer subjectId = degreeLevelFeeNew.getSubjectId();
         DegreeTypeEnum degreeType = degreeLevelFeeNew.getDegreeType();
-        String levels = degreeLevelFees.stream().map(e -> e.getLevel().toString()).collect(Collectors.joining(","));
+        String levels = degreeLevelFees.stream().map(e -> e.getLevel()).collect(Collectors.joining(","));
         String level = baseMapper.checkSave(subjectId,degreeType.getCode(),levels);
         if(StringUtils.isNotEmpty(level)){
             throw new BizException(level + "配置已存在");

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

@@ -61,7 +61,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
+    @Transactional(rollbackFor = Exception.class)
     public HttpResponseResult pay(DegreeRegistrationActivityDto degreeRegistration) throws Exception {
         //判断用户是否已存在订单
         List<StudentPaymentOrder> paymentOrders = studentPaymentOrderService.getUserOrderByType(degreeRegistration.getUserId(), OrderTypeEnum.DEGREE_REGISTRATION, DealStatusEnum.ING);
@@ -101,7 +101,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
                     .eq(DegreeLevelFeeNew::getDegreeType, degreeRegistration.getType())
                     .eq(DegreeLevelFeeNew::getLevel, degreeRegistration.getLevel()).one();
             if(Objects.isNull(one)){
-                throw new BizException("考级费用设置异常");
+                throw new BizException("该级别已不可报名");
             }
             degree.setMoney(one.getFee());
             degreeRegistrationList.add(degree);
@@ -113,11 +113,10 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         }
         
         Integer userId = degreeRegistration.getUserId();
-
         String channelType = "";
         StudentPaymentOrder studentPaymentOrder = new StudentPaymentOrder();
         studentPaymentOrder.setUserId(userId);
-        studentPaymentOrder.setGroupType(GroupType.SPORADIC);
+        studentPaymentOrder.setGroupType(GroupType.DEGREE);
         studentPaymentOrder.setOrderNo(orderNo);
         studentPaymentOrder.setType(OrderTypeEnum.DEGREE_REGISTRATION);
         studentPaymentOrder.setExpectAmount(money);
@@ -199,6 +198,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateStatus(StudentPaymentOrder studentPaymentOrder) {
         int updateCount = studentPaymentOrderService.update(studentPaymentOrder);
         if (updateCount <= 0) {
@@ -206,7 +206,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         }
         if(DealStatusEnum.SUCCESS.equals(studentPaymentOrder.getStatus())){
             List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailDao.getOrderDetail(studentPaymentOrder.getId());
-            BigDecimal additionCoursePrice = new BigDecimal(0);
+            BigDecimal additionCoursePrice = BigDecimal.ZERO;
             if(!CollectionUtils.isEmpty(orderDetails)){
                 additionCoursePrice = orderDetails.stream().map(StudentPaymentOrderDetail::getPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
             }

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

@@ -397,12 +397,8 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
 
     @Transactional(rollbackFor = Exception.class)
     public void updateOrder(Map<String, String> rpMap) throws Exception {
-
-        //logger.info("XXX-createOrder ---> updateOrder:{}", rpMap);
-
         DealStatusEnum status = rpMap.get("tradeState").equals("1") ? DealStatusEnum.SUCCESS : DealStatusEnum.FAILED;
         StudentPaymentOrder order = findOrderByOrderNo(rpMap.get("merOrderNo"));
-        //order = studentPaymentOrderDao.lockOrder(order.getId());
         //关闭或失败的订单查询订单成功,订单改成成功，钱退到余额
         if (order != null && (order.getStatus().equals(DealStatusEnum.CLOSE) || order.getStatus().equals(DealStatusEnum.FAILED)) && status.equals(DealStatusEnum.SUCCESS)) {
             String memo = order.getStatus().equals(DealStatusEnum.CLOSE) ? "关闭订单" : "失败订单";
@@ -457,28 +453,6 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             confirmOrder(order);
         }
         TenantContextHolder.clearTenantId();
-
-        /*StudentPaymentOrder finalOrder = order;
-        Executors.newCachedThreadPool().submit(() -> {
-
-            try {
-                TenantContextHolder.setTenantId(finalOrder.getTenantId());
-
-                callOrderCallBack(finalOrder);
-
-                if (status.equals(DealStatusEnum.SUCCESS)
-                        && StringUtils.isNotBlank(finalOrder.getPaymentChannel())
-                        && finalOrder.getPaymentChannel().equals("ADAPAY")
-                        && !rpMap.containsKey("simulation")) {
-                    confirmOrder(finalOrder);
-                }
-                TenantContextHolder.clearTenantId();
-            } catch (Exception e) {
-                logger.error("updateOrder 订单回调流程, order={}", JSON.toJSONString(finalOrder), e);
-            }
-
-        });*/
-
     }
 
     private Boolean confirmOrder(StudentPaymentOrder order) {
@@ -567,7 +541,6 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
 
     //调用相应业务回调接口
     public void callOrderCallBack(StudentPaymentOrder order) throws Exception {
-        //logger.info("XXX-createOrder ---> callOrderCallBack:{}", JSON.toJSONString(order));
         if(order.getGroupType() == GroupType.ACTIVITY){
             vipGroupActivityService.orderCallback(order);
         }else {

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

@@ -16,7 +16,7 @@
 				AND dn.status_ = #{param.status}
 			</if>
 			<if test="param.organId != null">
-				AND FIND_IN_SET(param.organId,dn.organ_ids_)
+				AND (FIND_IN_SET(param.organId,dn.organ_ids_) OR dn.organ_ids_ IS NULL OR dn.organ_ids_ = '')
 			</if>
 			<if test="param.organId == null and param.defaultOrganId != null and param.defaultOrganId != ''">
 				AND (INTE_ARRAY(param.defaultOrganId,dn.organ_ids_) OR dn.organ_ids_ IS NULL OR dn.organ_ids_ = '')

mec-web/src/main/java/com/ym/mec/web/controller/degree/DegreeNewsController.java

@@ -1,11 +1,12 @@
 package com.ym.mec.web.controller.degree;
 
+import com.alibaba.fastjson.JSONObject;
 import com.microsvc.toolkit.common.response.paging.PageInfo;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
-import com.microsvc.toolkit.common.response.template.R;
-
-import com.alibaba.fastjson.JSONObject;
+import com.ym.mec.biz.dal.entity.DegreeNews;
 import com.ym.mec.biz.dal.vo.DegreeNewsVo;
+import com.ym.mec.biz.dal.wrapper.DegreeNewsWrapper;
+import com.ym.mec.biz.service.DegreeNewsService;
 import com.ym.mec.biz.service.SysUserService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
@@ -15,18 +16,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-import com.ym.mec.biz.service.DegreeNewsService;
-import com.ym.mec.biz.dal.wrapper.DegreeNewsWrapper;
-import com.ym.mec.biz.dal.entity.DegreeNews;
+import org.springframework.web.bind.annotation.*;
 
 @Slf4j
 @Validated
@@ -44,20 +34,14 @@ public class DegreeNewsController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('degreeNews/detail')")
     @GetMapping("/detail/{id}")
     public HttpResponseResult<DegreeNews> detail(@PathVariable("id") Long id) {
-    
-    	DegreeNews wrapper = degreeNewsService.detail(id);
-        
-        return succeed(wrapper);
+        return succeed(degreeNewsService.detail(id));
 	}
     
     @ApiOperation(value = "查询分页", notes = "考级资讯表- 传入 DegreeNewsWrapper.DegreeNewsQuery") 
     @PreAuthorize("@pcs.hasPermissions('degreeNews/page')")
     @PostMapping("/page")
     public HttpResponseResult<PageInfo<DegreeNewsVo>> page(@RequestBody DegreeNewsWrapper.DegreeNewsQuery query) {
-        
-        IPage<DegreeNewsVo> pages = degreeNewsService.selectPage(QueryInfo.getPage(query), query);
-
-        return succeed(QueryInfo.pageInfo(pages));
+        return succeed(QueryInfo.pageInfo(degreeNewsService.selectPage(QueryInfo.getPage(query), query)));
 	}
     
     @ApiOperation(value = "新增", notes = "考级资讯表- 传入 DegreeNewsWrapper.DegreeNews")
@@ -65,9 +49,7 @@ public class DegreeNewsController extends BaseController {
 	@PostMapping("/save")
 	public HttpResponseResult<JSONObject> add(@Validated @RequestBody DegreeNews degreeNews) {
         degreeNews.setOperatorId(sysUserService.getUserId());
-        // 新增数据
         degreeNewsService.save(degreeNews);
-        
         return succeed();
 	}
     
@@ -76,9 +58,7 @@ public class DegreeNewsController extends BaseController {
 	@PostMapping("/update")
 	public HttpResponseResult<JSONObject> update(@Validated @RequestBody DegreeNews degreeNews) {
         degreeNews.setOperatorId(sysUserService.getUserId());
-        // 更新数据
         degreeNewsService.updateById(degreeNews);
-        
         return succeed();
 	}
 
@@ -96,7 +76,6 @@ public class DegreeNewsController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('degreeNews/remove')")
 	@PostMapping("/remove")    
 	public HttpResponseResult<Boolean> remove(@RequestParam Long id) {
-    
 		return succeed(degreeNewsService.removeById(id));
 	}
 }