ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOtherConfigController.java
@@ -39,7 +39,7 @@ @ApiOperation(value = "修改系统其他设置-通知阈值管理") @PostMapping(value = "/update") public R<Boolean> update(@Validated @RequestBody TOtherConfig dto) { if(dto.getDays()>=365){ if(dto.getDays()!=null && dto.getDays()>=365){ return R.fail("天数不能超过365天"); } return R.ok(otherConfigService.updateById(dto)); ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/CourseController.java
@@ -135,7 +135,8 @@ TCourse course = courseService.getById(courseOrder.getCourseId()); LocalDate endTime = course.getEndTime(); long count1 = insuranceOrderService.count(new LambdaQueryWrapper<TInsuranceOrder>().eq(TInsuranceOrder::getAppUserId, userId).eq(TInsuranceOrder::getStatus, 2)); long count1 = insuranceOrderService.count(new LambdaQueryWrapper<TInsuranceOrder>().eq(TInsuranceOrder::getType,course.getCourseType()).eq(TInsuranceOrder::getAppUserId, userId).eq(TInsuranceOrder::getStatus, 2)); if(count1<=0){ return R.fail("请先缴纳保险费"); } @@ -176,7 +177,9 @@ @ApiOperation(value = "课程模块--支付订单") public R<Map<String, Object>> payOrder(@RequestBody TCourseOrder courseOrder) { String userId = tokenService.getLoginUserApplet().getUserId(); long count1 = insuranceOrderService.count(new LambdaQueryWrapper<TInsuranceOrder>().eq(TInsuranceOrder::getAppUserId, userId).eq(TInsuranceOrder::getStatus, 2)); TCourse course = courseService.getById(courseOrder.getCourseId()); long count1 = insuranceOrderService.count(new LambdaQueryWrapper<TInsuranceOrder>().eq(TInsuranceOrder::getType,course.getCourseType()).eq(TInsuranceOrder::getAppUserId, userId).eq(TInsuranceOrder::getStatus, 2)); if(count1<=0){ return R.fail("请先缴纳保险费"); } ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/InsuranceController.java
@@ -59,10 +59,10 @@ */ @GetMapping("/getInsurance") @ApiOperation(value = "保险模块--获取用户是否有保险",response = TBanner.class) public R<UserInsuranceVo> getCourseList() { public R<UserInsuranceVo> getCourseList(int type) { String userId = tokenService.getLoginUserApplet().getUserId(); UserInsuranceVo insuranceVo = new UserInsuranceVo(); TInsuranceOrder one = tInsuranceOrderService.getOne(Wrappers.<TInsuranceOrder>lambdaQuery().eq(TInsuranceOrder::getAppUserId, userId).eq(TInsuranceOrder::getStatus, 2).orderByDesc(BaseModel::getCreateTime).last("LIMIT 1")); TInsuranceOrder one = tInsuranceOrderService.getOne(Wrappers.<TInsuranceOrder>lambdaQuery().eq(TInsuranceOrder::getType,type).eq(TInsuranceOrder::getAppUserId, userId).eq(TInsuranceOrder::getStatus, 2).orderByDesc(BaseModel::getCreateTime).last("LIMIT 1")); if(one!=null){ insuranceVo.setUserId(userId); insuranceVo.setPayTime(one.getPayTime()); @@ -80,7 +80,7 @@ TAppUser appUser = tAppUserService.getById(userId); // 查询保险订单 TInsuranceOrder one = tInsuranceOrderService.getOne(Wrappers.<TInsuranceOrder>lambdaQuery().eq(TInsuranceOrder::getAppUserId, userId).eq(TInsuranceOrder::getStatus, 2).orderByDesc(BaseModel::getCreateTime).last("LIMIT 1")); TInsuranceOrder one = tInsuranceOrderService.getOne(Wrappers.<TInsuranceOrder>lambdaQuery().eq(TInsuranceOrder::getType,dto.getCourseType()).eq(TInsuranceOrder::getAppUserId, userId).eq(TInsuranceOrder::getStatus, 2).orderByDesc(BaseModel::getCreateTime).last("LIMIT 1")); if(one!=null){ if(one.getEndTime().after(new Date())){ return R.fail("您已购买保险"); @@ -93,6 +93,7 @@ insuranceOrder.setIdCard(dto.getIdCard()); insuranceOrder.setImg(dto.getImg()); insuranceOrder.setPayType(dto.getType()); insuranceOrder.setType(dto.getCourseType()); TInsurance insurance = tInsuranceService.getOne(new LambdaQueryWrapper<TInsurance>().eq(TInsurance::getStatus, 1)); if(insurance==null){ return R.fail("保险已关闭"); ruoyi-system/src/main/java/com/ruoyi/system/dto/BuyInsuranceDto.java
@@ -22,4 +22,7 @@ @ApiModelProperty("1线上2线下") private Integer type; @ApiModelProperty("1=社区大学课程 2=暑期青少年工艺培训班") private Integer courseType; } ruoyi-system/src/main/java/com/ruoyi/system/model/TInsuranceOrder.java
@@ -43,6 +43,10 @@ @ApiModelProperty(value = "用户id") private String appUserId; @TableField("type") @ApiModelProperty(value = "1=社区大学课程 2=暑期青少年工艺培训班") private Integer type; @TableField("name") @ApiModelProperty(value = "姓名") private String name;