修改订单记录

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

@@ -7,6 +7,7 @@ import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.modules.order.bo.OrderAddBo;
+import com.zhongzheng.modules.order.bo.OrderEditBo;
 import com.zhongzheng.modules.order.bo.OrderGoodsQueryBo;
 import com.zhongzheng.modules.order.bo.OrderQueryBo;
 import com.zhongzheng.modules.order.service.IOrderGoodsService;
@@ -63,5 +64,13 @@ public class OrderController extends BaseController {
         return getDataTable(list);
     }
 
-
+    /**
+     * 修改订单
+     */
+    @ApiOperation("修改订单")
+    @Log(title = "订单", businessType = BusinessType.UPDATE)
+    @PostMapping("edit")
+    public AjaxResult<Void> edit(@RequestBody OrderEditBo bo) {
+        return toAjax(iOrderService.updateByEditBo(bo) ? 1 : 0);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserStudyRecordMapper.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.user.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo;
 import com.zhongzheng.modules.user.bo.UserQueryBo;
+import com.zhongzheng.modules.user.bo.UserStudyRecordAddBo;
 import com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo;
 import com.zhongzheng.modules.user.domain.UserStudyRecord;
 import com.zhongzheng.modules.user.vo.*;
@@ -35,4 +36,6 @@ public interface UserStudyRecordMapper extends BaseMapper<UserStudyRecord> {
     List<ExamSonStudyRecordVo> listExamSon(SubjectStudyRecordQueryBo bo);
 
     List<String> examTypes(Long id);
+
+    Long selectStudyRecord(UserStudyRecordAddBo bo);
 }

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

@@ -104,7 +104,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         this.save(add);
         //新增学时记录,照片
         userPeriodSave(add,bo);
-       //完成当天学习计划
+        //完成当天学习计划
         userPlanSave(add);
         return 0;
     }
@@ -129,12 +129,20 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
 
     private void userPeriodSave(UserStudyRecord entity,UserStudyRecordAddBo bo){
         //记录学时审核
-        // 第一次学习加一条学时审核记录
-        //第二次学习验证是否审核，是否作弊，是否重修，待审核未完整播放
+        Long periodId = null;
+        // 学习无记录加一条学时审核记录
+        if (baseMapper.selectStudyRecord(bo) > 0){
+
+        }
+        //待审有结束时间跳过下面两步
+        //有学习记录时审核记录或0作弊或3待重修更改为待审核，完整播放也添加结束时间
+        //有学习记录完整播放且为待审添加结束时间
+
         //记录照片
         UserStudyRecordPhotoAddBo userStudyRecordPhotoAddBo = new UserStudyRecordPhotoAddBo();
         userStudyRecordPhotoAddBo.setPhoto(bo.getPhoto());
         userStudyRecordPhotoAddBo.setRecordId(entity.getRecordId());
+        userStudyRecordPhotoAddBo.setPeriodId(periodId);
         userStudyRecordPhotoService.insertByAddBo(userStudyRecordPhotoAddBo);
     }