submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -561,7 +561,13 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         if (Validator.isEmpty(orderGoods)) {
             return "班级商品不存在";
         }
-
+        Goods goods = iGoodsService.getById(orderGoods.getGoodsId());
+        CourseBusinessQueryBo businessQueryBo = new CourseBusinessQueryBo();
+        businessQueryBo.setId(goods.getBusinessId());
+        String fullName = iCourseBusinessService.queryFullName(businessQueryBo);
+        if (("继续教育二级建造师".equals(fullName)) || ("继续教育二级造价师".equals(fullName))) {
+            return "继教二建/二造班级不需要推送注册中心";
+        }
         Long bmrq = 0L;
         if(userVo.getClassStartTime().longValue()<orderGoods.getCreateTime().longValue()){
             bmrq = orderGoods.getCreateTime();

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderGoodsRefundMapper.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @date 2022-01-04
  */
 public interface OrderGoodsRefundMapper extends BaseMapper<OrderGoodsRefund> {
-    List<OrderGoodsRefundVo> selectList(OrderGoodsRefundQueryBo bo);
+    List<OrderGoodsRefundVo> selectListByBo(OrderGoodsRefundQueryBo bo);
 
     Long selectCountConfirmPeriod(@Param("userId") Long userId, @Param("refundId") Long refundId);
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsRefundServiceImpl.java

@@ -486,7 +486,7 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
 
     @Override
     public List<OrderGoodsRefundVo> selectList(OrderGoodsRefundQueryBo bo) {
-        return baseMapper.selectList(bo);
+        return baseMapper.selectListByBo(bo);
     }
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -55,10 +55,7 @@ import com.zhongzheng.modules.grade.vo.ClassGradeVo;
 import com.zhongzheng.modules.inform.service.IInformRemindService;
 import com.zhongzheng.modules.inform.service.IInformUserService;
 import com.zhongzheng.modules.order.bo.*;
-import com.zhongzheng.modules.order.domain.Order;
-import com.zhongzheng.modules.order.domain.OrderGoods;
-import com.zhongzheng.modules.order.domain.OrderInput;
-import com.zhongzheng.modules.order.domain.OrderPay;
+import com.zhongzheng.modules.order.domain.*;
 import com.zhongzheng.modules.order.mapper.OrderMapper;
 import com.zhongzheng.modules.order.service.*;
 import com.zhongzheng.modules.order.vo.*;
@@ -97,6 +94,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Autowired
     private IOrderGoodsService iOrderGoodsService;
     @Autowired
+    private IOrderGoodsRefundService iOrderGoodsRefundService;
+    @Autowired
     private IGoodsService iGoodsService;
     @Autowired
     private IClassGradeService iClassGradeService;
@@ -1354,6 +1353,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 if (orderGoodsVo.getGoodsRealPrice() != null) {
                     totalPrice = totalPrice.add(orderGoodsVo.getGoodsRealPrice());
                 }
+                //审核状态
+                List<OrderGoodsRefund> refundList = iOrderGoodsRefundService
+                        .list(new LambdaQueryWrapper<OrderGoodsRefund>()
+                        .eq(OrderGoodsRefund::getOrderGoodsId, orderGoodsVo.getOrderGoodsId()));
+                if (CollectionUtils.isNotEmpty(refundList)){
+                    OrderGoodsRefund refund = refundList.stream().filter(item -> item.getPeriodStatus() != -1 && item.getPeriodStatus() != -2).findFirst().orElse(null);
+                    orderGoodsVo.setPeriodStatus(ObjectUtils.isNotNull(refund)?refund.getPeriodStatus():null);
+                }
             }
             orderListVo.setOrderGoodsList(list);
             orderListVo.setTotalPrice(totalPrice);

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -118,12 +118,10 @@
         g.cover_url,
         cet.education_name,
         cpt.project_name,
-        ogr.period_status,
         cb.business_name
         FROM
         order_goods og
         LEFT JOIN goods g ON og.goods_id = g.goods_id
-        LEFT JOIN order_goods_refund ogr ON og.order_goods_id = ogr.order_goods_id
         LEFT JOIN course_education_type cet ON g.education_type_id = cet.id
         LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
         LEFT JOIN course_business cb ON g.business_id = cb.id

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsRefundMapper.xml

@@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="refundTime" column="refund_time"/>
     </resultMap>
 
-    <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsRefundQueryBo" resultMap="OrderGoodsRefundVoResult">
+    <select id="selectListByBo" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsRefundQueryBo" resultMap="OrderGoodsRefundVoResult">
         SELECT
             gr.*,
             g.goods_name,