From 171937b29d6d8a65994b57a74cc2144878f61ed4 Mon Sep 17 00:00:00 2001 From: cjw Date: Tue, 20 Aug 2024 15:41:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=B7=E6=A0=BC=EF=BC=9B?= =?UTF-8?q?=E8=AF=81=E4=B9=A6=E8=BF=94=E5=9B=9E=E5=9B=BE=E7=89=87url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/wx/WxCounselorController.java | 46 +++++++++++++++++++ .../domain/vo/CounselorQualificationVo.java | 14 ++++-- 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java index b2ee93b..8b7211b 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java @@ -3,11 +3,13 @@ package org.dromara.scale.controller.wx; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; +import org.dromara.scale.domain.bo.CounselorBo; import org.dromara.scale.domain.bo.CounselorExperienceBo; import org.dromara.scale.domain.bo.CounselorQualificationBo; import org.dromara.scale.domain.bo.ReservationDayBo; @@ -22,6 +24,7 @@ import org.dromara.scale.service.IReservationService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.math.BigDecimal; import java.util.List; /** @@ -102,4 +105,47 @@ public class WxCounselorController extends BaseController { return R.ok(experienceService.queryList(bo)); } + /** + * 新增培训经历 + */ + @Log(title = "新增培训经历", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/experience") + public R addExperience(@Validated(AddGroup.class) @RequestBody CounselorExperienceBo bo) { + Long userId = LoginHelper.getUserId(); + bo.setCounselorId(userId); + return toAjax(experienceService.insertByBo(bo)); + } + + /** + * 修改培训经历 + */ + @Log(title = "修改培训经历", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/experience") + public R editExperience(@Validated(EditGroup.class) @RequestBody CounselorExperienceBo bo) { + CounselorExperienceVo old = experienceService.queryById(bo.getId()); + Long userId = LoginHelper.getUserId(); + Long counselorId = old.getCounselorId(); + if (!userId.equals(counselorId)) { + R.fail("无法修改他人信息"); + } + bo.setCounselorId(userId); + return toAjax(experienceService.updateByBo(bo)); + } + + /** + * 修改预约价格 + */ + @Log(title = "修改预约价格", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/price") + public R editPrice(String price) { + Long userId = LoginHelper.getUserId(); + CounselorBo bo = new CounselorBo(); + bo.setId(userId); + bo.setPrice(new BigDecimal(price)); + return toAjax(counselorService.updateByBo(bo)); + } + } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorQualificationVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorQualificationVo.java index 0092579..19b2376 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorQualificationVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorQualificationVo.java @@ -1,16 +1,16 @@ package org.dromara.scale.domain.vo; -import org.dromara.scale.domain.CounselorQualification; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; +import io.github.linpeilie.annotations.AutoMapping; import lombok.Data; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; +import org.dromara.scale.domain.CounselorQualification; import java.io.Serial; import java.io.Serializable; -import java.util.Date; @@ -29,7 +29,7 @@ public class CounselorQualificationVo implements Serializable { private static final long serialVersionUID = 1L; /** - * + * */ @ExcelProperty(value = "") private Long id; @@ -52,5 +52,9 @@ public class CounselorQualificationVo implements Serializable { @ExcelProperty(value = "证书图片") private Long certificateImage; + @Translation(type = TransConstant.OSS_ID_TO_URL) + @AutoMapping(target = "certificateImage") + private Long certificateImageUrl; + }