Merge branch 'master' of http://metapixels.top:9003/zhouyang/bus

bus-biz/src/main/java/bus/service/impl/BCoursePreServiceImpl.java

@@ -13,6 +13,7 @@ import bus.service.BUserPreService;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.orcas.common.sso.model.ExtInfo;
 import com.orcas.iso.config.common.user.CurrentUserHolder;
@@ -58,7 +59,7 @@ public class BCoursePreServiceImpl extends ServiceImpl<BCoursePreMapper, BCourse
         // 计算当日、本周六和周日日期
         Date now = new Date();
         String today = DateUtil.format(now, "yyyy-MM-dd");
-       // String saturday = DateUtil.format(DateUtil.endOfWeek(now), "yyyy-MM-dd");
+        String saturday = DateUtil.format(DateUtil.endOfWeek(now), "yyyy-MM-dd");
         String sunday = DateUtil.format(DateUtil.offsetDay(DateUtil.endOfWeek(now), 1), "yyyy-MM-dd");
 
         BUserPreStatDto statDto = new BUserPreStatDto();
@@ -91,10 +92,20 @@ public class BCoursePreServiceImpl extends ServiceImpl<BCoursePreMapper, BCourse
      */
     @Override
     public void savePre(BUserPreDto dto) {
+        String today = null;
+        Date now = new Date();
+        if(dto.getType().equals("0")){
+            today = DateUtil.format(now, "yyyy-MM-dd");
+        }else if(dto.getType().equals("1")){
+            today = DateUtil.format(DateUtil.endOfWeek(now), "yyyy-MM-dd");
+        }else{
+            today = DateUtil.format(DateUtil.offsetDay(DateUtil.endOfWeek(now), 1), "yyyy-MM-dd");
+        }
         ExtInfo extInfo = CurrentUserHolder.get();
         QueryWrapper<BUserPrePo> queryWrapper = new QueryWrapper();
         queryWrapper.eq("pre_id",dto.getPreId());
         queryWrapper.eq("user_id",extInfo.getUserId());
+        queryWrapper.eq("pre_date",today);
         queryWrapper.eq("is_delete",0);
         if(bUserPreMapper.selectList(queryWrapper).size()>0){
             throw new RuntimeException("该时间段已预约");
@@ -103,7 +114,7 @@ public class BCoursePreServiceImpl extends ServiceImpl<BCoursePreMapper, BCourse
         BUserPrePo po = new BUserPrePo();
         po.setCourseId(bCoursePrePo.getCourseId());
         po.setPreId(dto.getPreId());
-        po.setPreDate(dto.getPreDate());
+        po.setPreDate(DateUtil.parse(today, "yyyy-MM-dd"));
         po.setType(dto.getType());
         po.setUserId(extInfo.getUserId());
         po.setId(snowflakeUtil.snowflakeId());
@@ -118,6 +129,20 @@ public class BCoursePreServiceImpl extends ServiceImpl<BCoursePreMapper, BCourse
 
     @Override
     public void cancelPre(String preId, String Type) {
+        String today = null;
+        Date now = new Date();
+        if(Type.equals("0")){
+            today = DateUtil.format(now, "yyyy-MM-dd");
+        }else if(Type.equals("1")){
+            today = DateUtil.format(DateUtil.endOfWeek(now), "yyyy-MM-dd");
+        }else{
+            today = DateUtil.format(DateUtil.offsetDay(DateUtil.endOfWeek(now), 1), "yyyy-MM-dd");
+        }
+        UpdateWrapper<BUserPrePo> updateWrapper = new UpdateWrapper();
+        updateWrapper.eq("pre_id",preId);
+        updateWrapper.eq("pre_date",today);
+        updateWrapper.set("is_delete",1);
+        bUserPreMapper.update(null,updateWrapper);
 
     }
 

bus-common/src/main/java/bus/model/dto/BUserPreDto.java

@@ -16,8 +16,6 @@ public class BUserPreDto{
 
     @ApiModelProperty("预约时刻id")
     private String preId;
-    @ApiModelProperty("预约日期 年月日")
-    private Date preDate;
     @ApiModelProperty("类型 0当日 1周6 2周天")
     private String type;
     @ApiModelProperty("备注")

bus-web/src/main/java/bus/controller/biz/BCoursePreController.java

@@ -56,6 +56,14 @@ public class BCoursePreController implements BaseController {
     }
 
 
+    @ApiOperation("用户取消预约")
+    @GetMapping(value = "cancelPre")
+    public String cancelPre(@RequestParam String preId,@RequestParam String Type){
+        bCoursePreService.cancelPre(preId,Type);
+        return "取消成功";
+    }
+
+
 //    /**
 //     * 详情
 //     * @param id