MERGE

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

@@ -691,7 +691,7 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
                             goodsVo.setSubscribeSign(1);
                         }else if (subscribe.getSubscribeStatus() == 1  && ObjectUtils.isNotNull(subscribe.getExamStatus())
                                 && subscribe.getExamStatus() == 1
-                                && ObjectUtils.isNull(userSubscribe.getResult())){
+                                && ObjectUtils.isNull(subscribe.getResult())){
                             goodsVo.setSubscribeSign(2);
                         }else if (subscribe.getSubscribeStatus() == 1 && ObjectUtils.isNotNull(subscribe.getExamStatus())
                                 && subscribe.getExamStatus() == 0){

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

@@ -485,15 +485,10 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 List<TopOldOrderGoods> list = topOrderGoodsService.list(new LambdaQueryWrapper<TopOldOrderGoods>()
                         .eq(TopOldOrderGoods::getOrderSn, item.getOrderSn())
                         .isNotNull(TopOldOrderGoods::getRelSignId)
-                        .eq(TopOldOrderGoods::getStatus, 1));
+                        .eq(TopOldOrderGoods::getStatus, 1)
+                        .orderByDesc(TopOldOrderGoods::getOrderGoodsId));
                 if (CollectionUtils.isNotEmpty(list)){
-                    if (list.stream().anyMatch(x -> x.getCheckStatus() == 0)){
-                        item.setStudentCheckStatus(0);
-                    }else if (list.stream().allMatch(x -> x.getCheckStatus() == 1)){
-                        item.setStudentCheckStatus(1);
-                    }else if (list.stream().allMatch(x -> x.getCheckStatus() == 2)){
-                        item.setStudentCheckStatus(2);
-                    }
+                    item.setStudentCheckStatus(list.get(0).getCheckStatus());
                 }
 
                 //订单金额

zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderGoodsMapper.xml

@@ -83,9 +83,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             order_sn = #{orderSn}
             AND `status` = 1
-            AND check_status in (0,1)
+--             AND check_status in (0,1)
 --           AND refund_status != 2
 -- 	      AND pay_status IN (2,3,4)
+        <if test="checkStatus != null">
+            AND check_status = #{checkStatus}
+        </if>
+        <if test="checkStatus == null">
+            AND check_status in (0,1,2)
+        </if>
         <if test="userCard != null and userCard != ''">
             AND user_card = #{userCard,typeHandler=com.zhongzheng.common.type.EncryptHandler}
         </if>