Merge branch 'dev'

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassBusinessVo.java

@@ -15,6 +15,8 @@ public class ClassBusinessVo implements Serializable {
 
     private String className;
 
+    private Integer classStatus;
+
     private String startTime;
 
     private String endTime;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -4540,11 +4540,10 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 }
                 //已退
                 BigDecimal refunded = new BigDecimal("0.00");
-                TopOldOrder orderBySn = baseMapper.getOrderBySn(vo.getOrderSn());
-                if (orderBySn.getOrderFrom() == 1 || orderBySn.getOrderFrom() == 4){
+                if (vo.getOrderFrom() == 1 || vo.getOrderFrom() == 4){
                     //新系统订单
                     List<OrderGoodsRefund> list = orderGoodsRefundService.list(new LambdaQueryWrapper<OrderGoodsRefund>()
-                            .eq(OrderGoodsRefund::getOrderSn, orderBySn.getOrderSn())
+                            .eq(OrderGoodsRefund::getOrderSn, vo.getOrderSn())
                             .eq(OrderGoodsRefund::getStatus, 1)
                             .eq(OrderGoodsRefund::getPeriodStatus, 3));
                     if (CollectionUtils.isNotEmpty(list)){
@@ -4552,7 +4551,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     }
                 }else {
                     List<TopOldOrderRefund> list = topOldOrderRefundService.list(new LambdaQueryWrapper<TopOldOrderRefund>()
-                            .eq(TopOldOrderRefund::getOrderSn, orderBySn.getOrderSn())
+                            .eq(TopOldOrderRefund::getOrderSn, vo.getOrderSn())
                             .eq(TopOldOrderRefund::getStatus, 1)
                             .eq(TopOldOrderRefund::getPeriodStatus, 3));
                     if (CollectionUtils.isNotEmpty(list)){
@@ -4591,11 +4590,10 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             }else {
                 //已退
                 BigDecimal refunded = new BigDecimal("0.00");
-                TopOldOrder orderBySn = baseMapper.getOrderBySn(vo.getOrderSn());
-                if (orderBySn.getOrderFrom() == 1 || orderBySn.getOrderFrom() == 4){
+                if (vo.getOrderFrom() == 1 || vo.getOrderFrom() == 4){
                     //新系统订单
                     List<OrderGoodsRefund> list = orderGoodsRefundService.list(new LambdaQueryWrapper<OrderGoodsRefund>()
-                            .eq(OrderGoodsRefund::getOrderSn, orderBySn.getOrderSn())
+                            .eq(OrderGoodsRefund::getOrderSn, vo.getOrderSn())
                             .eq(OrderGoodsRefund::getStatus, 1)
                             .eq(OrderGoodsRefund::getPeriodStatus, 3));
                     if (CollectionUtils.isNotEmpty(list)){
@@ -4603,7 +4601,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     }
                 }else {
                     List<TopOldOrderRefund> list = topOldOrderRefundService.list(new LambdaQueryWrapper<TopOldOrderRefund>()
-                            .eq(TopOldOrderRefund::getOrderSn, orderBySn.getOrderSn())
+                            .eq(TopOldOrderRefund::getOrderSn, vo.getOrderSn())
                             .eq(TopOldOrderRefund::getStatus, 1)
                             .eq(TopOldOrderRefund::getPeriodStatus, 3));
                     if (CollectionUtils.isNotEmpty(list)){
@@ -4696,8 +4694,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                             requestVos = JSONArray.parseArray(JSONArray.toJSONString(jsonObject.get("Data")),TopOrderRequestVo.class);
                         }
                     } catch (Exception e) {
-                        log.error("旧系统修改备注接口请求错误" + respone);
-                        throw new CustomException("旧系统修改备注接口请求错误");
+                        log.error("旧系统查询补考次数接口请求错误" + respone);
+//                        throw new CustomException("旧系统查询补考次数接口请求错误");
                     }
                 }
                 for (TopOldOrderRepDetailVo item : list) {
@@ -4730,7 +4728,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                         }
                     }else if (CollectionUtils.isNotEmpty(requestVos)){
                         TopOrderRequestVo topOrderRequestVo = requestVos.stream()
-                                .filter(x -> x.getIdNum().equals(item.getUserCard()) && x.getMajorName().equals(item.getMajorName())).findFirst().orElse(null);
+                                .filter(x -> ObjectUtils.isNotNull(x.getIdNum()) && x.getIdNum().equals(item.getUserCard()) &&
+                                        StringUtils.isNotBlank(x.getMajorName()) && StringUtils.isNotBlank(item.getMajorName()) &&
+                                        x.getMajorName().equals(item.getMajorName())).findFirst().orElse(null);
                         if (ObjectUtils.isNotNull(topOrderRequestVo)){
                             item.setApplyNum(topOrderRequestVo.getCount());
                         }

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -1710,6 +1710,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM (
                  SELECT DISTINCT cg.grade_id,
                                  cg.class_name,
+                                 cg.class_status,
                                  DATE_FORMAT(FROM_UNIXTIME(cg.class_start_time), '%Y-%m-%d %H:%i:%s') AS startTime,
                                  DATE_FORMAT(FROM_UNIXTIME(cg.class_end_time), '%Y-%m-%d %H:%i:%s') AS endTime,
                                  cg.student_upper,