From 649b7f9bcb5181af886d70aed661c401a30312da Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Fri, 31 Mar 2023 09:42:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=94=AF=E4=BB=98=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting/SettingPaymentController.java | 10 +++++- .../admin/service/ISettingPaymentService.java | 33 ++++++++++++++++++ .../impl/SettingPaymentServiceImpl.java | 34 ++++++++++++++++++- .../vo/setting/SettingPaymentDetailVo.java | 14 ++++++++ .../vo/setting/SettingPaymentMethodVo.java | 6 +++- 5 files changed, 94 insertions(+), 3 deletions(-) create mode 100644 server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingPaymentDetailVo.java diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingPaymentController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingPaymentController.java index 8db77914..389b5cdc 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingPaymentController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingPaymentController.java @@ -7,6 +7,7 @@ import com.mdd.admin.validate.setting.SettingPayMethodValidate; import com.mdd.admin.vo.setting.SettingPaymentMethodVo; import com.mdd.common.core.AjaxResult; import com.mdd.common.entity.setting.DevPayConfig; +import com.mdd.common.validator.annotation.IDMust; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.annotation.Validated; @@ -32,11 +33,18 @@ public class SettingPaymentController { @GetMapping("/list") @ApiOperation(value="支付配置列表") - public AjaxResult list() { + public AjaxResult> list() { List list = iSettingPaymentService.list(); return AjaxResult.success(list); } + @GetMapping("/detail") + @ApiOperation(value="支付配置详情") + public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { + DevPayConfig vo = iSettingPaymentService.detail(id); + return AjaxResult.success(vo); + } + @PostMapping("/editConfig") @ApiOperation(value="支付配置编辑") public AjaxResult editConfig(@Validated @RequestBody SettingPayConfigValidate configValidate) { diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/ISettingPaymentService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ISettingPaymentService.java index d50897f4..cca89451 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/ISettingPaymentService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ISettingPaymentService.java @@ -12,12 +12,45 @@ import java.util.List; */ public interface ISettingPaymentService { + /** + * 支付方式 + * + * @author fzr + * @return List> + */ List> method(); + /** + * 配置列表 + * + * @author fzr + * @return List + */ List list(); + /** + * 配置详情 + * + * @author fzr + * @param id 主键 + * @return SettingPaymentMethodVo + */ + DevPayConfig detail(Integer id); + + /** + * 编辑支付配置 + * + * @author fzr + * @param configValidate 参数 + */ void editConfig(SettingPayConfigValidate configValidate); + /** + * 编辑支付方式 + * + * @author fzr + * @param methodValidate 参数 + */ void editMethod(SettingPayMethodValidate methodValidate); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingPaymentServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingPaymentServiceImpl.java index 7ed4a72e..fed00532 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingPaymentServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingPaymentServiceImpl.java @@ -13,7 +13,6 @@ import com.mdd.common.mapper.setting.DevPayConfigMapper; import com.mdd.common.mapper.setting.DevPayWayMapper; import com.mdd.common.util.MapUtils; import com.mdd.common.util.UrlUtils; -import io.swagger.models.auth.In; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,6 +35,12 @@ public class SettingPaymentServiceImpl implements ISettingPaymentService { @Resource DevPayWayMapper devPayWayMapper; + /** + * 支付配置方式 + * + * @author fzr + * @return List> + */ public List> method() { List lists = devPayWayMapper.selectList(null); @@ -97,6 +102,27 @@ public class SettingPaymentServiceImpl implements ISettingPaymentService { return devPayConfigs; } + /** + * 支付配置详情 + * + * @author fzr + * @param id 主键 + * @return DevPayConfig + */ + @Override + public DevPayConfig detail(Integer id) { + DevPayConfig devPayConfig = devPayConfigMapper.selectOne( + new QueryWrapper() + .eq("id", id) + .last("limit 1")); + + devPayConfig.setName(PaymentEnum.getPayWayMsg(devPayConfig.getWay())); + devPayConfig.setShowName(devPayConfig.getName()); + devPayConfig.setParams(MapUtils.jsonToMap(devPayConfig.getParams().toString())); + devPayConfig.setIcon(UrlUtils.toAbsoluteUrl(devPayConfig.getIcon())); + return devPayConfig; + } + /** * 支付配置编辑 * @@ -124,6 +150,12 @@ public class SettingPaymentServiceImpl implements ISettingPaymentService { devPayConfigMapper.updateById(devPayConfig); } + /** + * 支付方式编辑 + * + * @author fzr + * @param methodValidate 参数 + */ @Override @Transactional public void editMethod(SettingPayMethodValidate methodValidate) { diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingPaymentDetailVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingPaymentDetailVo.java new file mode 100644 index 00000000..46e77396 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingPaymentDetailVo.java @@ -0,0 +1,14 @@ +package com.mdd.admin.vo.setting; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class SettingPaymentDetailVo implements Serializable { + + private static final long serialVersionUID = 1L; + + + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingPaymentMethodVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingPaymentMethodVo.java index b76e7f67..fd032545 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingPaymentMethodVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingPaymentMethodVo.java @@ -2,8 +2,12 @@ package com.mdd.admin.vo.setting; import lombok.Data; +import java.io.Serializable; + @Data -public class SettingPaymentMethodVo { +public class SettingPaymentMethodVo implements Serializable { + + private static final long serialVersionUID = 1L; private Integer id;