merge

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

@@ -80,9 +80,13 @@ public interface IOrderGoodsService extends IService<OrderGoods> {
 
     List<OrderGoodsVo> listLiveGoodsList(GoodsQueryBo bo);
 
+    void listGoodsStudyList(OrderGoodsQueryBo bo);
+
     List<OrderGoodsVo> listGoodsUserLive(Long userId);
 
     List<OrderUserGoodsVo> listUserSubjectGoods(OrderSubjectUserBuyBo bo);
 
     List<OrderGoodsVo> selectBuyUserList(Long mockMajorSubjectId);
+
+
 }

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

@@ -366,6 +366,32 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         return list;
     }
 
+    /**
+     * 获取用户订单所有商品的所有学习情况
+     * @param bo
+     */
+    @Override
+    public void listGoodsStudyList(OrderGoodsQueryBo bo) {
+        OrderGoodsQueryBo orderGoodsQueryBo = new OrderGoodsQueryBo();
+        orderGoodsQueryBo.setGoodsId(1L);
+        List<OrderGoodsVo> orderGoodsVos = baseMapper.selectOrderGoods(orderGoodsQueryBo);
+        for(OrderGoodsVo goodsVo : orderGoodsVos){
+            if(goodsVo.getGoodsType()==1){
+                List<CourseVo> courseVoList = iGoodsCourseService.selectList(goodsVo.getGoodsId());
+                for(CourseVo courseVo : courseVoList){
+                    UserStudyRecordQueryBo queryBo = new UserStudyRecordQueryBo();
+                    queryBo.setCourseId(courseVo.getCourseId());
+                    List<ClassPeriodVo> sectionList = iUserStudyRecordService.menuAllList(queryBo); //课程所有节列表
+                    for(ClassPeriodVo periodVo : sectionList){
+                        if(periodVo.getSectionType()==2||periodVo.getSectionType()==3){
+
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     @Override
     public List<OrderGoodsVo> listGoodsUserLive(Long userId) {
         List<OrderGoodsVo> list = this.baseMapper.listGoodsUserLive(userId);

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

@@ -103,4 +103,6 @@ public class OrderInputVo {
 
 	@ApiModelProperty("商品类型 1视频2题库 3补考 4前培 5虚拟赠送题库 6直播")
 	private Integer goodsType;
+	@ApiModelProperty("商品成交价格")
+	private BigDecimal goodsRealPrice;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserStudyRecord.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.user.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -65,4 +66,6 @@ private static final long serialVersionUID=1L;
     private Integer currentStatus;
     /** 订单商品ID */
     private Long orderGoodsId;
+
+    private String photo;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserExamGoodsServiceImpl.java

@@ -213,6 +213,7 @@ public class UserExamGoodsServiceImpl extends ServiceImpl<UserExamGoodsMapper, U
                         objectLambdaUpdateWrapper.set(UserExamGoods::getUpdateTime,DateUtils.getNowTime());
                         update(null, objectLambdaUpdateWrapper);
                         entity.setStatus(-1);
+                        entity.setUpdateTime(DateUtils.getNowTime());
                         iUserExamGoodsSupplementService.updateById(entity);
                         return true;
                     }else{
@@ -231,6 +232,7 @@ public class UserExamGoodsServiceImpl extends ServiceImpl<UserExamGoodsMapper, U
                         objectLambdaUpdateWrapper.set(UserExamGoods::getUpdateTime,DateUtils.getNowTime());
                         update(null, objectLambdaUpdateWrapper);
                         entity.setStatus(-1);
+                        entity.setUpdateTime(DateUtils.getNowTime());
                         iUserExamGoodsSupplementService.updateById(entity);
                         return true;
                     }else{

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserMockSubscribeServiceImpl.java

@@ -299,8 +299,10 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
                     lqw.orderByDesc(MockMajorSubjectTime::getId).last("limit 1");
                     MockMajorSubjectTime mockMajorSubjectTime = iMockMajorSubjectTimeService.getOne(lqw);
                     try {
-                        if (System.currentTimeMillis()/1000 < formatTime(mockMajorSubjectTime.getExamTime(), mockMajorSubjectTime.getStartTime())) {
-                            userMockSubscribeVo.setReSubscribe(1);
+                        if (Validator.isEmpty(userMockSubscribeVo.getHandStatus()) || userMockSubscribeVo.getHandStatus() == 0) {
+                            if (System.currentTimeMillis()/1000 < formatTime(mockMajorSubjectTime.getExamTime(), mockMajorSubjectTime.getStartTime())) {
+                                userMockSubscribeVo.setReSubscribe(1);
+                            }
                         }
                         if (System.currentTimeMillis()/1000 < formatTime(mockMajorSubjectTime.getExamTime(), mockMajorSubjectTime.getEndTime())) {
                             userMockSubscribeVo.setCanDo(0);
@@ -375,6 +377,19 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
 
     @Override
     public UserMockSubscribeVo listSubscribeInfo(Long subscribeId) {
-        return baseMapper.listSubscribeInfo(subscribeId);
+        UserMockSubscribeVo userMockSubscribeVo = baseMapper.listSubscribeInfo(subscribeId);
+        LambdaQueryWrapper<MockMajorSubjectTime> lqw = Wrappers.lambdaQuery();
+        lqw.eq(MockMajorSubjectTime::getMockMajorSubjectId, userMockSubscribeVo.getMockMajorSubjectId());
+        lqw.orderByDesc(MockMajorSubjectTime::getExamTime).last("limit 1");
+        MockMajorSubjectTime mockMajorSubjectTime = iMockMajorSubjectTimeService.getOne(lqw);
+        try {
+            if (System.currentTimeMillis()/1000 < formatTime(mockMajorSubjectTime.getExamTime(), mockMajorSubjectTime.getEndTime())) {
+                userMockSubscribeVo.setCanDo(0);
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        return userMockSubscribeVo;
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -319,23 +319,28 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        add.setStartTime(DateUtils.getNowTime().longValue() - add.getStudyDuration().longValue());
+        if(Validator.isNotEmpty(add.getStudyDuration())){
+            add.setStartTime(DateUtils.getNowTime().longValue() - add.getStudyDuration().longValue());
+        }else{
+            add.setStartTime(DateUtils.getNowTime().longValue());
+        }
         add.setEndTime(DateUtils.getNowTime());
         if(Validator.isNotEmpty(first)&&Validator.isNotEmpty(first.getFirstStartTime())){
             add.setFirstStartTime(first.getFirstStartTime());
         }else{
             add.setFirstStartTime(add.getStartTime());
         }
-        if(courseSectionVo.getSectionType()==1||courseSectionVo.getSectionType()==2||courseSectionVo.getSectionType()==3){
+        this.save(add);
+/*        if(courseSectionVo.getSectionType()==1||courseSectionVo.getSectionType()==2||courseSectionVo.getSectionType()==3){
             UserStudyRecordQueryBo queryBo = BeanUtil.toBean(bo, UserStudyRecordQueryBo.class);
-/*            queryBo.setUserId(bo.getUserId());
+*//*            queryBo.setUserId(bo.getUserId());
             queryBo.setGradeId(bo.getGradeId());
             queryBo.setGoodsId(bo.getGoodsId());
             queryBo.setCourseId(bo.getCourseId());
             queryBo.setModuleId(bo.getModuleId());
             queryBo.setChapterId(bo.getChapterId());
             queryBo.setSectionId(bo.getSectionId());
-            queryBo.setOrderGoodsId(bo.getOrderGoodsId());*/
+            queryBo.setOrderGoodsId(bo.getOrderGoodsId());*//*
             UserStudyRecordVo lastVo = queryLast(queryBo);
             if(Validator.isEmpty(lastVo)||Validator.isEmpty(lastVo.getVideoCurrentTime())||lastVo.getVideoCurrentTime().longValue()>add.getVideoCurrentTime().longValue()){
                 //如果没有历史数据或者之前播放时长比现在晚，则新增观看记录
@@ -359,7 +364,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
             }
         }else{
             this.save(add);
-        }
+        }*/
 
         //新增学时记录,照片
         userPeriodSave(add, bo);

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserMockSubscribeVo.java

@@ -66,9 +66,9 @@ public class UserMockSubscribeVo {
 	@Excel(name = "成绩")
 	@ApiModelProperty("成绩")
 	private Long performance;
-	/** 交卷状态 0为交卷 1手动交卷 2自动交卷 */
-	@Excel(name = "交卷状态 0为交卷 1手动交卷 2自动交卷")
-	@ApiModelProperty("交卷状态 0为交卷 1手动交卷 2自动交卷")
+	/** 交卷状态 0未交卷 1手动交卷 2自动交卷 */
+	@Excel(name = "交卷状态 0未交卷 1手动交卷 2自动交卷")
+	@ApiModelProperty("交卷状态 0未交卷 1手动交卷 2自动交卷")
 	private Integer handStatus;
 	/** 1通过 0不通过 */
 	@Excel(name = "1通过 0不通过")

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserStudyRecordVo.java

@@ -109,4 +109,7 @@ public class UserStudyRecordVo {
 	@Excel(name = "录播和回放的url地址")
 	@ApiModelProperty("录播和回放的url地址")
 	private String recordingUrl;
+
+	@ApiModelProperty("拍照地址")
+	private String photo;
 }

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

@@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderGoodsId" column="order_goods_id"/>
         <result property="goodsRefund" column="goods_refund"/>
         <result property="goodsType" column="goods_type"/>
+        <result property="goodsRealPrice" column="goods_real_price"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderInputQueryBo" resultMap="OrderInputVoResult">
@@ -112,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             any_value ( cb.business_name ) business_name,
             (select IFNULL(sum(og.goods_received),0) from order_goods og LEFT JOIN `order` o on o.order_sn = og.order_sn  where o.input_order_sn = oi.input_order_sn and og.refund_status = 2) goods_refund,
             IFNULL(sum( og.goods_received ),0) goods_received,
+            IFNULL(sum( og.goods_real_price ),0) goods_real_price,
             IFNULL(sum( o.order_price ),0) order_price,
             IFNULL(sum( o.pay_price ),0) pay_price,
             any_value ( oi.create_username ) create_username,

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

@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="firstStartTime" column="first_start_time"/>
         <result property="currentStatus" column="current_status"/>
         <result property="orderGoodsId" column="order_goods_id"/>
+        <result property="photo" column="photo"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.GoodsStudyRecordVo" id="GoodsStudyRecordVoResult">