修改订单记录

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseMenuQueryBo.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.course.bo;
 
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -67,4 +68,9 @@ public class CourseMenuQueryBo extends BaseEntity {
 	/** 章Id */
 	@ApiModelProperty("章Id")
 	private Long chapterId;
+
+	/** 1模块卷 2章卷 3试卷 */
+	@Excel(name = "1 需重修")
+	@ApiModelProperty("1 需重修")
+	private Integer rebuild;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseChapterSectionServiceImpl.java

@@ -148,6 +148,10 @@ public class CourseChapterSectionServiceImpl extends ServiceImpl<CourseChapterSe
                 }
             }
         }
+        if (bo.getRebuild() == 1) {
+            List<CourseUserChapterSectionVo> courseUserChapterSectionVos1 = courseUserChapterSectionVos.stream().filter(s -> s.getRebuild().equals("1")).collect(Collectors.toList());
+            return courseUserChapterSectionVos1;
+        }
         return courseUserChapterSectionVos;
     }
 }

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

@@ -19,4 +19,6 @@ public interface OrderMapper extends BaseMapper<Order> {
     List<OrderListVo> selectList(OrderQueryBo bo);
 
     Integer selectUserClass(@Param("goodsId") Long goodsId,@Param("userId") Long userId);
+
+    List<OrderListVo> selectListApp(OrderQueryBo bo);
 }

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

@@ -253,12 +253,19 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
     @Override
     public List<OrderListVo> selectListApp(OrderQueryBo bo) {
-        List<OrderListVo> orderListVos = orderMapper.selectList(bo);
+        List<OrderListVo> orderListVos = orderMapper.selectListApp(bo);
         for (OrderListVo orderListVo : orderListVos) {
             OrderGoodsQueryBo orderGoodsQueryBo = new OrderGoodsQueryBo();
             orderGoodsQueryBo.setOrderSn(orderListVo.getOrderSn());
             List<OrderGoodsVo> list = iOrderGoodsService.selectList(orderGoodsQueryBo);
+            BigDecimal totalPrice = new BigDecimal("0");
+            for (OrderGoodsVo orderGoodsVo : list) {
+                if (orderGoodsVo.getGoodsRealPrice() != null) {
+                    totalPrice = totalPrice.add(orderGoodsVo.getGoodsRealPrice());
+                }
+            }
             orderListVo.setOrderGoodsList(list);
+            orderListVo.setTotalPrice(totalPrice);
         }
         return orderListVos;
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderListVo.java

@@ -153,6 +153,10 @@ public class OrderListVo {
 	@ApiModelProperty("订单状态")
 	private Long status;
 
+	/** 总价格 */
+	@ApiModelProperty("总价格")
+	private BigDecimal totalPrice;
+
 	/** 订单商品 */
 	@ApiModelProperty("订单商品")
 	private List<OrderGoodsVo> orderGoodsList;

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

@@ -152,6 +152,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and cg.`status` =1
           and unix_timestamp(now()) BETWEEN cg.class_start_time and cg.class_end_time
     </select>
+    <select id="selectListApp" parameterType="com.zhongzheng.modules.order.bo.OrderQueryBo" resultMap="OrderResultVo">
+        SELECT
+            o.*
 
+        FROM
+            `order` o where 1=1
+        <if test="userId != null">
+            AND o.user_id = #{userId}
+        </if>
+        <if test="orderStatus != null">
+            AND o.order_status = #{orderStatus}
+        </if>
+        <if test="startTime != null">
+            AND o.create_time >= #{startTime}
+        </if>
+        <if test="endTime != null">
+            AND #{endTime} >= o.create_time
+        </if>
+        <if test="status != null">
+            AND o.status = #{status}
+        </if>
+        ORDER BY o.order_id DESC
+    </select>
 
 </mapper>