From f420f1050863f5026ae579c990b4d35ad656b6b8 Mon Sep 17 00:00:00 2001 From: cjw Date: Wed, 21 Aug 2024 10:12:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ActivityEnterController.java | 25 ------------------- .../controller/wx/WxCounselorController.java | 11 ++++---- .../scale/controller/wx/WxPayController.java | 3 +++ .../scale/service/ISysScaleOrderService.java | 2 ++ 4 files changed, 10 insertions(+), 31 deletions(-) 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 6b08c80..b5b9224 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 @@ -6,10 +6,7 @@ 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.excel.utils.ExcelUtil; -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; @@ -69,28 +66,6 @@ public class ActivityEnterController extends BaseController { return R.ok(activityEnterService.queryById(id)); } - /** - * 新增活动报名 - */ - @SaCheckPermission("activity:enter:add") - @Log(title = "活动报名", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody ActivityEnterBo bo) { - return toAjax(activityEnterService.insertByBo(bo)); - } - - /** - * 修改活动报名 - */ - @SaCheckPermission("activity:enter:edit") - @Log(title = "活动报名", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody ActivityEnterBo bo) { - return toAjax(activityEnterService.updateByBo(bo)); - } - /** * 删除活动报名 * 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 2c63eba..514f2ce 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 @@ -24,7 +24,6 @@ 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; /** @@ -140,12 +139,12 @@ public class WxCounselorController extends BaseController { @Log(title = "修改预约价格", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/price") - public R editPrice(String price) { + public R editPrice(@RequestBody CounselorBo bo) { Long userId = LoginHelper.getUserId(); - CounselorBo bo = new CounselorBo(); - bo.setId(userId); - bo.setPrice(new BigDecimal(price)); - return toAjax(counselorService.updateByBo(bo)); + CounselorBo newBo = new CounselorBo(); + newBo.setId(userId); + newBo.setPrice(bo.getPrice()); + return toAjax(counselorService.updateByBo(newBo)); } /** 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 4389fd7..033b219 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 @@ -5,6 +5,7 @@ import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; import com.github.binarywang.wxpay.exception.WxPayException; import com.github.binarywang.wxpay.service.WxPayService; import lombok.RequiredArgsConstructor; +import org.dromara.scale.service.ISysScaleOrderService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -26,6 +27,8 @@ public class WxPayController { private final WxPayService payService; + private final ISysScaleOrderService sysScaleOrderService; + @PostMapping("/notify/order/scale") public String parseScaleNotifyResult(@RequestBody String xmlData) throws WxPayException { final WxPayOrderNotifyResult notifyResult = this.payService.parseOrderNotifyResult(xmlData); diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleOrderService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleOrderService.java index 9e71fd1..4b47fee 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleOrderService.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleOrderService.java @@ -48,4 +48,6 @@ public interface ISysScaleOrderService { */ T insertByBo(SysScaleOrderBo bo) throws Exception; + + }