修改订单记录

zhongzheng-api/src/main/java/com/zhongzheng/controller/order/OrderController.java

@@ -51,7 +51,7 @@ public class OrderController extends BaseController {
         startPage();
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
-        List<OrderListVo> list = iOrderService.selectList(bo);
+        List<OrderListVo> list = iOrderService.selectListApp(bo);
         return getDataTable(list);
     }
 

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

@@ -255,7 +255,19 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
 
     @Override
     public List<CourseUserVo> courseList(CourseQueryBo bo) {
-        return baseMapper.courseList(bo);
+        List<CourseUserVo> courseUserVos = baseMapper.courseList(bo);
+        for (CourseUserVo courseUserVo : courseUserVos) {
+            SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();
+            subjectStudyRecordQueryBo.setGoodsId(bo.getGoodsId());
+            subjectStudyRecordQueryBo.setUserId(bo.getUserId());
+            subjectStudyRecordQueryBo.setGradeId(courseUserVo.getGradeId());
+            subjectStudyRecordQueryBo.setCourseId(courseUserVo.getCourseId());
+            List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubject(subjectStudyRecordQueryBo);
+            if (!CollectionUtils.isEmpty(subjectStudyRecordVos)){
+            }
+        }
+
+        return courseUserVos;
     }
 
     private List<UserStudyRecordPhotoVo> entity2PhotoVo(Collection<UserStudyRecordPhoto> collection) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseUserVo.java

@@ -111,4 +111,13 @@ public class CourseUserVo {
 	private Long createTime;
 	@ApiModelProperty("修改时间")
 	private Long updateTime;
+
+	/** 学习进度 */
+	@ApiModelProperty("已学节数")
+	private Long stuAllNum;
+
+
+	/** 学习进度 */
+	@ApiModelProperty("总节数")
+	private Long secAllNum;
 }

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

@@ -58,4 +58,6 @@ public interface IOrderService extends IService<Order> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	List<OrderListVo> selectListApp(OrderQueryBo bo);
 }

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

@@ -99,12 +99,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Override
     public List<OrderListVo> selectList(OrderQueryBo bo) {
         List<OrderListVo> orderListVos = orderMapper.selectList(bo);
-        for (OrderListVo orderListVo : orderListVos) {
-            OrderGoodsQueryBo orderGoodsQueryBo = new OrderGoodsQueryBo();
-            orderGoodsQueryBo.setOrderSn(orderListVo.getOrderSn());
-            List<OrderGoodsVo> list = iOrderGoodsService.selectList(orderGoodsQueryBo);
-            orderListVo.setOrderGoodsList(list);
-        }
         return orderListVos;
     }
 
@@ -257,6 +251,18 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         return this.removeByIds(ids);
     }
 
+    @Override
+    public List<OrderListVo> selectListApp(OrderQueryBo bo) {
+        List<OrderListVo> orderListVos = orderMapper.selectList(bo);
+        for (OrderListVo orderListVo : orderListVos) {
+            OrderGoodsQueryBo orderGoodsQueryBo = new OrderGoodsQueryBo();
+            orderGoodsQueryBo.setOrderSn(orderListVo.getOrderSn());
+            List<OrderGoodsVo> list = iOrderGoodsService.selectList(orderGoodsQueryBo);
+            orderListVo.setOrderGoodsList(list);
+        }
+        return orderListVos;
+    }
+
 
     /**
      * 加入班级

zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -168,6 +168,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="goodsId != null and goodsId !=''">
             and c.goods_id =#{goodsId}
         </if>
+        <if test="courserId != null and courserId !=''">
+            and c.courser_id =#{courserId}
+        </if>
     </select>
 
     <select id="listSection" parameterType="com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo"  resultMap="SectionStudyRecordVoResult">