From 54410bf98d4fe87545b165375dec63561bbd8f84 Mon Sep 17 00:00:00 2001 From: cjw Date: Wed, 21 Aug 2024 09:35:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=9B=E6=96=B0=E5=A2=9E=E6=93=85=E9=95=BF=E9=A2=86?= =?UTF-8?q?=E5=9F=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ActivityEnterController.java | 43 ++++++++++--------- .../controller/wx/WxActivityController.java | 21 +++++++++ .../controller/wx/WxCounselorController.java | 14 ++++++ ...Controller.java => WxOrderController.java} | 12 +++--- .../scale/controller/wx/WxPayController.java | 11 ++++- .../dromara/scale/domain/ActivityEnter.java | 7 ++- .../scale/domain/bo/ActivityEnterBo.java | 11 +++-- .../scale/domain/vo/ActivityEnterVo.java | 12 +++--- .../scale/mapper/SysScaleOrderMapper.java | 2 + .../impl/CounselorExperienceServiceImpl.java | 2 +- 10 files changed, 95 insertions(+), 40 deletions(-) create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxActivityController.java rename ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/{WxScaleOrderController.java => WxOrderController.java} (87%) diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ActivityEnterController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ActivityEnterController.java index 6d804c2..6b08c80 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ActivityEnterController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ActivityEnterController.java @@ -1,26 +1,27 @@ package org.dromara.scale.controller; -import java.util.List; - -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +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.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.scale.domain.vo.ActivityEnterVo; -import org.dromara.scale.domain.bo.ActivityEnterBo; -import org.dromara.scale.service.IActivityEnterService; +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.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.scale.domain.bo.ActivityEnterBo; +import org.dromara.scale.domain.vo.ActivityEnterVo; +import org.dromara.scale.service.IActivityEnterService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 活动报名 @@ -39,7 +40,7 @@ public class ActivityEnterController extends BaseController { /** * 查询活动报名列表 */ - @SaCheckPermission("scale:activityEnter:list") + @SaCheckPermission("activity:enter:list") @GetMapping("/list") public TableDataInfo list(ActivityEnterBo bo, PageQuery pageQuery) { return activityEnterService.queryPageList(bo, pageQuery); @@ -48,7 +49,7 @@ public class ActivityEnterController extends BaseController { /** * 导出活动报名列表 */ - @SaCheckPermission("scale:activityEnter:export") + @SaCheckPermission("activity:enter:export") @Log(title = "活动报名", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(ActivityEnterBo bo, HttpServletResponse response) { @@ -61,7 +62,7 @@ public class ActivityEnterController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("scale:activityEnter:query") + @SaCheckPermission("activity:enter:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { @@ -71,7 +72,7 @@ public class ActivityEnterController extends BaseController { /** * 新增活动报名 */ - @SaCheckPermission("scale:activityEnter:add") + @SaCheckPermission("activity:enter:add") @Log(title = "活动报名", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +83,7 @@ public class ActivityEnterController extends BaseController { /** * 修改活动报名 */ - @SaCheckPermission("scale:activityEnter:edit") + @SaCheckPermission("activity:enter:edit") @Log(title = "活动报名", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +96,7 @@ public class ActivityEnterController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("scale:activityEnter:remove") + @SaCheckPermission("activity:enter:remove") @Log(title = "活动报名", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxActivityController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxActivityController.java new file mode 100644 index 0000000..fed852e --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxActivityController.java @@ -0,0 +1,21 @@ +package org.dromara.scale.controller.wx; + +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

TODO

+ * + * @author cjw + * @version V1.0.0 + * @date 2024/8/20 16:27 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wx/activity") +public class WxActivityController { + +} 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 8b7211b..c71c349 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 @@ -148,4 +148,18 @@ public class WxCounselorController extends BaseController { return toAjax(counselorService.updateByBo(bo)); } + /** + * 修改擅长领域 + */ + @Log(title = "修改擅长领域", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/speciality") + public R editSpeciality(List specialityField) { + Long userId = LoginHelper.getUserId(); + CounselorBo bo = new CounselorBo(); + bo.setId(userId); + bo.setSpecialityField(specialityField); + return toAjax(counselorService.updateByBo(bo)); + } + } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScaleOrderController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxOrderController.java similarity index 87% rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScaleOrderController.java rename to ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxOrderController.java index b8e4b8e..dd3bf14 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScaleOrderController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxOrderController.java @@ -1,6 +1,5 @@ package org.dromara.scale.controller.wx; -import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import org.apache.poi.ss.formula.functions.T; @@ -27,16 +26,15 @@ import org.springframework.web.bind.annotation.*; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/wx/scale/order") -public class WxScaleOrderController extends BaseController { +@RequestMapping("/wx/order/") +public class WxOrderController extends BaseController { private final ISysScaleOrderService sysScaleOrderService; /** * 查询量表订单列表 */ - @SaCheckPermission("scale:scaleOrder:list") - @GetMapping("/list") + @GetMapping("/scale/pageList") public TableDataInfo list(SysScaleOrderBo bo, PageQuery pageQuery) { return sysScaleOrderService.queryPageList(bo, pageQuery); } @@ -46,7 +44,7 @@ public class WxScaleOrderController extends BaseController { * * @param id 主键 */ - @GetMapping("/{id}") + @GetMapping("/scale/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(sysScaleOrderService.queryById(id)); @@ -57,7 +55,7 @@ public class WxScaleOrderController extends BaseController { */ @Log(title = "量表订单", businessType = BusinessType.INSERT) @RepeatSubmit() - @PostMapping() + @PostMapping("/scale") public R add(@Validated(AddGroup.class) @RequestBody SysScaleOrderBo bo) throws Exception { return R.ok(sysScaleOrderService.insertByBo(bo)); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxPayController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxPayController.java index 128e4c6..4389fd7 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxPayController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxPayController.java @@ -26,8 +26,15 @@ public class WxPayController { private final WxPayService payService; - @PostMapping("/notify/order") - public String parseOrderNotifyResult(@RequestBody String xmlData) throws WxPayException { + @PostMapping("/notify/order/scale") + public String parseScaleNotifyResult(@RequestBody String xmlData) throws WxPayException { + final WxPayOrderNotifyResult notifyResult = this.payService.parseOrderNotifyResult(xmlData); + // TODO 根据自己业务场景需要构造返回对象 + return WxPayNotifyResponse.success("成功"); + } + + @PostMapping("/notify/order/reservation") + public String parseReservationNotifyResult(@RequestBody String xmlData) throws WxPayException { final WxPayOrderNotifyResult notifyResult = this.payService.parseOrderNotifyResult(xmlData); // TODO 根据自己业务场景需要构造返回对象 return WxPayNotifyResponse.success("成功"); diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ActivityEnter.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ActivityEnter.java index e12bd8e..86a10d3 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ActivityEnter.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ActivityEnter.java @@ -22,7 +22,7 @@ public class ActivityEnter extends BaseEntity { private static final long serialVersionUID = 1L; /** - * + * */ @TableId(value = "id") private Long id; @@ -32,5 +32,10 @@ public class ActivityEnter extends BaseEntity { */ private Long activityId; + /** + * 活动状态，0已报名，1已签到 + */ + private Integer status; + } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ActivityEnterBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ActivityEnterBo.java index c7d2470..d81a383 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ActivityEnterBo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ActivityEnterBo.java @@ -21,16 +21,21 @@ import jakarta.validation.constraints.*; public class ActivityEnterBo extends BaseEntity { /** - * + * */ - @NotNull(message = "不能为空", groups = { EditGroup.class }) + @NotNull(message = "不能为空", groups = {EditGroup.class}) private Long id; /** * 活动id */ - @NotNull(message = "活动id不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotNull(message = "活动id不能为空", groups = {AddGroup.class, EditGroup.class}) private Long activityId; + /** + * 活动状态，0已报名，1已签到 + */ + private Integer status; + } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ActivityEnterVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ActivityEnterVo.java index 02fcf34..c04484c 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ActivityEnterVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ActivityEnterVo.java @@ -1,16 +1,13 @@ package org.dromara.scale.domain.vo; -import org.dromara.scale.domain.ActivityEnter; 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 lombok.Data; +import org.dromara.scale.domain.ActivityEnter; import java.io.Serial; import java.io.Serializable; -import java.util.Date; @@ -29,7 +26,7 @@ public class ActivityEnterVo implements Serializable { private static final long serialVersionUID = 1L; /** - * + * */ @ExcelProperty(value = "") private Long id; @@ -40,5 +37,10 @@ public class ActivityEnterVo implements Serializable { @ExcelProperty(value = "活动id") private Long activityId; + /** + * 活动状态，0已报名，1已签到 + */ + private Integer status; + } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleOrderMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleOrderMapper.java index d40108e..4f58a43 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleOrderMapper.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleOrderMapper.java @@ -1,5 +1,6 @@ package org.dromara.scale.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.scale.domain.SysScaleOrder; import org.dromara.scale.domain.vo.SysScaleOrderVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author cjw * @date 2024-07-30 */ +@Mapper public interface SysScaleOrderMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorExperienceServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorExperienceServiceImpl.java index 7322ab9..54e9993 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorExperienceServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorExperienceServiceImpl.java @@ -71,7 +71,7 @@ public class CounselorExperienceServiceImpl implements ICounselorExperienceServi Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getCounselorId() != null, CounselorExperience::getCounselorId, bo.getCounselorId()); - lqw.orderByAsc(CounselorExperience::getStartTime); + lqw.orderByDesc(CounselorExperience::getStartTime); return lqw; }