From e3d50cf74ef8da1b824166aed8faa335e64795c8 Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Thu, 5 Sep 2024 18:04:07 +0800 Subject: [PATCH 1/6] =?UTF-8?q?1.=20=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/SmChannelController.java | 88 ++++++++++++ .../ruoyi/system/mapper/ChannelMapper.java | 65 +++++++++ .../ruoyi/system/service/ChannelService.java | 82 +++++++++++ .../service/impl/ChannelServiceImpl.java | 127 ++++++++++++++++++ .../resources/mapper/system/ChannelMapper.xml | 93 +++++++++++++ 5 files changed, 455 insertions(+) create mode 100644 electripper-admin/src/main/java/com/ruoyi/web/controller/system/SmChannelController.java create mode 100644 electripper-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java create mode 100644 electripper-system/src/main/java/com/ruoyi/system/service/ChannelService.java create mode 100644 electripper-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java create mode 100644 electripper-system/src/main/resources/mapper/system/ChannelMapper.xml diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SmChannelController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SmChannelController.java new file mode 100644 index 0000000..6b07c93 --- /dev/null +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SmChannelController.java @@ -0,0 +1,88 @@ +//package com.ruoyi.web.controller.system; +// +//import com.ruoyi.common.annotation.Log; +//import com.ruoyi.common.core.controller.BaseController; +//import com.ruoyi.common.core.domain.AjaxResult; +//import com.ruoyi.common.core.domain.ValidGroup; +//import com.ruoyi.common.core.page.TableDataInfo; +//import com.ruoyi.common.enums.BusinessType; +//import com.ruoyi.common.utils.poi.ExcelUtil; +//import com.ruoyi.ss.channel.domain.Channel; +//import com.ruoyi.ss.channel.domain.ChannelQuery; +//import com.ruoyi.ss.channel.domain.ChannelVO; +//import com.ruoyi.ss.channel.service.ChannelService; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.security.access.prepost.PreAuthorize; +//import org.springframework.validation.annotation.Validated; +//import org.springframework.web.bind.annotation.*; +// +//import javax.servlet.http.HttpServletResponse; +//import java.util.List; +// +///** +// * 充值渠道Controller +// * +// * @author ruoyi +// * @date 2024-04-15 +// */ +//@RestController +//@RequestMapping("/system/channel") +//public class SmChannelController extends BaseController +//{ +// @Autowired +// private ChannelService smChannelService; +// +// /** +// * 查询充值渠道列表 +// */ +// @PreAuthorize("@ss.hasPermi('system:channel:list')") +// @GetMapping("/list") +// public TableDataInfo list(ChannelQuery smChannel) +// { +// startPage(); +// List list = smChannelService.selectSmChannelList(smChannel); +// return getDataTable(list); +// } +// +// /** +// * 导出充值渠道列表 +// */ +// @PreAuthorize("@ss.hasPermi('system:channel:export')") +// @Log(title = "充值渠道", businessType = BusinessType.EXPORT) +// @PostMapping("/export") +// public void export(HttpServletResponse response, ChannelQuery smChannel) +// { +// List list = smChannelService.selectSmChannelList(smChannel); +// ExcelUtil util = new ExcelUtil(ChannelVO.class); +// util.exportExcel(response, list, "充值渠道数据"); +// } +// +// /** +// * 获取充值渠道详细信息 +// */ +// @PreAuthorize("@ss.hasPermi('system:channel:query')") +// @GetMapping(value = "/{channelId}") +// public AjaxResult getInfo(@PathVariable("channelId") Long channelId) +// { +// return success(smChannelService.selectSmChannelByChannelId(channelId)); +// } +// +// /** +// * 修改充值渠道 +// */ +// @PreAuthorize("@ss.hasPermi('system:channel:edit')") +// @Log(title = "充值渠道", businessType = BusinessType.UPDATE) +// @PutMapping +// public AjaxResult edit(@RequestBody @Validated(ValidGroup.Update.class) Channel form) +// { +// Channel channel = new Channel(); +// channel.setChannelId(form.getChannelId()); +// channel.setEnabled(form.getEnabled()); +// channel.setServiceRate(form.getServiceRate()); +// channel.setCostRate(form.getCostRate()); +// channel.setServiceType(form.getServiceType()); +// channel.setPicture(form.getPicture()); +// return toAjax(smChannelService.updateSmChannel(channel)); +// } +// +//} diff --git a/electripper-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java b/electripper-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java new file mode 100644 index 0000000..58826ee --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java @@ -0,0 +1,65 @@ +package com.ruoyi.system.mapper; + +//import com.ruoyi.ss.channel.domain.Channel; +//import com.ruoyi.ss.channel.domain.ChannelQuery; +//import com.ruoyi.ss.channel.domain.ChannelVO; +//import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 充值渠道Mapper接口 + * + * @author ruoyi + * @date 2024-04-15 + */ +public interface ChannelMapper +{ +// /** +// * 查询充值渠道 +// * +// * @param channelId 充值渠道主键 +// * @return 充值渠道 +// */ +// public ChannelVO selectSmChannelByChannelId(Long channelId); +// +// /** +// * 查询充值渠道列表 +// * +// * @param smChannel 充值渠道 +// * @return 充值渠道集合 +// */ +// public List selectSmChannelList(@Param("query") ChannelQuery smChannel); +// +// /** +// * 新增充值渠道 +// * +// * @param channel 充值渠道 +// * @return 结果 +// */ +// public int insertSmChannel(Channel channel); +// +// /** +// * 修改充值渠道 +// * +// * @param channel 充值渠道 +// * @return 结果 +// */ +// public int updateSmChannel(@Param("data") Channel channel); +// +// /** +// * 删除充值渠道 +// * +// * @param channelId 充值渠道主键 +// * @return 结果 +// */ +// public int deleteSmChannelByChannelId(Long channelId); +// +// /** +// * 批量删除充值渠道 +// * +// * @param channelIds 需要删除的数据主键集合 +// * @return 结果 +// */ +// public int deleteSmChannelByChannelIds(Long[] channelIds); +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/ChannelService.java b/electripper-system/src/main/java/com/ruoyi/system/service/ChannelService.java new file mode 100644 index 0000000..817a1fe --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/service/ChannelService.java @@ -0,0 +1,82 @@ +//package com.ruoyi.system.service; +// +//import com.ruoyi.ss.channel.domain.Channel; +//import com.ruoyi.ss.channel.domain.ChannelQuery; +//import com.ruoyi.ss.channel.domain.ChannelVO; +// +//import java.util.List; +//import java.util.Map; +//import java.util.function.Function; +// +///** +// * 充值渠道Service接口 +// * +// * @author ruoyi +// * @date 2024-04-15 +// */ +//public interface ChannelService +//{ +// /** +// * 查询充值渠道 +// * +// * @param channelId 充值渠道主键 +// * @return 充值渠道 +// */ +// public ChannelVO selectSmChannelByChannelId(Long channelId); +// +// /** +// * 查询充值渠道列表 +// * +// * @param smChannel 充值渠道 +// * @return 充值渠道集合 +// */ +// public List selectSmChannelList(ChannelQuery smChannel); +// +// /** +// * 新增充值渠道 +// * +// * @param channel 充值渠道 +// * @return 结果 +// */ +// public int insertSmChannel(Channel channel); +// +// /** +// * 修改充值渠道 +// * +// * @param channel 充值渠道 +// * @return 结果 +// */ +// public int updateSmChannel(Channel channel); +// +// /** +// * 批量删除充值渠道 +// * +// * @param channelIds 需要删除的充值渠道主键集合 +// * @return 结果 +// */ +// public int deleteSmChannelByChannelIds(Long[] channelIds); +// +// /** +// * 删除充值渠道信息 +// * +// * @param channelId 充值渠道主键 +// * @return 结果 +// */ +// public int deleteSmChannelByChannelId(Long channelId); +// +// /** +// * 查询启用的充值渠道列表 +// * +// * @return +// */ +// List selectEnabledRechargeList(); +// +// /** +// * 查询充值渠道映射表 +// * +// * @param query 查询条件 +// * @param keyMapper 映射函数 +// */ +// Map selectMap(ChannelQuery query, Function keyMapper); +// +//} diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java new file mode 100644 index 0000000..f6d2cb1 --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java @@ -0,0 +1,127 @@ +//package com.ruoyi.system.service.impl; +// +//import com.ruoyi.common.utils.collection.CollectionUtils; +//import com.ruoyi.ss.account.service.AccountService; +//import com.ruoyi.ss.channel.domain.Channel; +//import com.ruoyi.ss.channel.domain.ChannelQuery; +//import com.ruoyi.ss.channel.domain.ChannelVO; +//import com.ruoyi.ss.channel.mapper.ChannelMapper; +//import com.ruoyi.ss.channel.service.ChannelService; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Service; +// +//import java.util.Collections; +//import java.util.List; +//import java.util.Map; +//import java.util.function.Function; +//import java.util.stream.Collectors; +// +///** +// * 充值渠道Service业务层处理 +// * +// * @author ruoyi +// * @date 2024-04-15 +// */ +//@Service +//public class ChannelServiceImpl implements ChannelService +//{ +// @Autowired +// private ChannelMapper channelMapper; +// +// @Autowired +// private AccountService accountService; +// +// /** +// * 查询充值渠道 +// * +// * @param channelId 充值渠道主键 +// * @return 充值渠道 +// */ +// @Override +// public ChannelVO selectSmChannelByChannelId(Long channelId) +// { +// return channelMapper.selectSmChannelByChannelId(channelId); +// } +// +// /** +// * 查询充值渠道列表 +// * +// * @param smChannel 充值渠道 +// * @return 充值渠道 +// */ +// @Override +// public List selectSmChannelList(ChannelQuery smChannel) +// { +// return channelMapper.selectSmChannelList(smChannel); +// } +// +// /** +// * 新增充值渠道 +// * +// * @param channel 充值渠道 +// * @return 结果 +// */ +// @Override +// public int insertSmChannel(Channel channel) +// { +// return channelMapper.insertSmChannel(channel); +// } +// +// /** +// * 修改充值渠道 +// * +// * @param channel 充值渠道 +// * @return 结果 +// */ +// @Override +// public int updateSmChannel(Channel channel) +// { +// return channelMapper.updateSmChannel(channel); +// } +// +// /** +// * 批量删除充值渠道 +// * +// * @param channelIds 需要删除的充值渠道主键 +// * @return 结果 +// */ +// @Override +// public int deleteSmChannelByChannelIds(Long[] channelIds) +// { +// return channelMapper.deleteSmChannelByChannelIds(channelIds); +// } +// +// /** +// * 删除充值渠道信息 +// * +// * @param channelId 充值渠道主键 +// * @return 结果 +// */ +// @Override +// public int deleteSmChannelByChannelId(Long channelId) +// { +// return channelMapper.deleteSmChannelByChannelId(channelId); +// } +// +// @Override +// public List selectEnabledRechargeList() { +// ChannelQuery dto = new ChannelQuery(); +// dto.setEnabled(true); +// return this.selectSmChannelList(dto); +// } +// +// /** +// * 查询充值渠道映射表 +// * +// * @param query 查询条件 +// * @param keyMapper 映射函数 +// */ +// @Override +// public Map selectMap(ChannelQuery query, Function keyMapper) { +// List list = this.selectSmChannelList(query); +// if (CollectionUtils.isEmptyElement(list)) { +// return Collections.emptyMap(); +// } +// return list.stream().collect(Collectors.toMap(keyMapper, item -> item)); +// } +//} diff --git a/electripper-system/src/main/resources/mapper/system/ChannelMapper.xml b/electripper-system/src/main/resources/mapper/system/ChannelMapper.xml new file mode 100644 index 0000000..56f9b6a --- /dev/null +++ b/electripper-system/src/main/resources/mapper/system/ChannelMapper.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 99ef46526b65cab4b03e51f385709196f7a63077 Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Fri, 6 Sep 2024 11:13:14 +0800 Subject: [PATCH 2/6] =?UTF-8?q?1.=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/system/domain/Channel.java | 56 +++++++++++++++++++ .../com/ruoyi/system/domain/ChannelQuery.java | 17 ++++++ .../com/ruoyi/system/domain/ChannelVO.java | 11 ++++ 3 files changed, 84 insertions(+) create mode 100644 electripper-system/src/main/java/com/ruoyi/system/domain/Channel.java create mode 100644 electripper-system/src/main/java/com/ruoyi/system/domain/ChannelQuery.java create mode 100644 electripper-system/src/main/java/com/ruoyi/system/domain/ChannelVO.java diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/Channel.java b/electripper-system/src/main/java/com/ruoyi/system/domain/Channel.java new file mode 100644 index 0000000..32f87a4 --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/Channel.java @@ -0,0 +1,56 @@ +package com.ruoyi.system.domain; + +import com.fasterxml.jackson.annotation.JsonView; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.common.core.domain.JsonViewProfile; +import com.ruoyi.common.core.domain.ValidGroup; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Min; +import java.math.BigDecimal; + +/** + * 充值渠道对象 sm_channel + * + * @author ruoyi + * @date 2024-04-15 + */ +@Data +public class Channel extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @JsonView(JsonViewProfile.App.class) + private Long channelId; + + /** 渠道名称 */ + @Excel(name = "渠道名称") + @JsonView(JsonViewProfile.App.class) + private String name; + + /** 是否启用 */ + @Excel(name = "是否启用") + private Boolean enabled; + + /** 服务费费率% */ + @Excel(name = "服务费费率%") + @Min(value = 0, message = "服务费费率不允许低于0", groups = {ValidGroup.Update.class}) + private BigDecimal serviceRate; + + /** 成本率% */ + @Excel(name = "成本率%") + @Min(value = 0, message = "成本率不允许低于0", groups = {ValidGroup.Update.class}) + private BigDecimal costRate; + + @Excel(name = "服务费类型") + @ApiModelProperty("服务费类型") + private String serviceType; + + @ApiModelProperty("渠道图片") + @JsonView(JsonViewProfile.App.class) + private String picture; + +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelQuery.java b/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelQuery.java new file mode 100644 index 0000000..d751588 --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelQuery.java @@ -0,0 +1,17 @@ +package com.ruoyi.system.domain; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author wjh + * 2024/5/5 + */ +@Data +public class ChannelQuery extends Channel { + + @ApiModelProperty("渠道ID列表") + private List channelIds; +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelVO.java b/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelVO.java new file mode 100644 index 0000000..4917c5f --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelVO.java @@ -0,0 +1,11 @@ +package com.ruoyi.system.domain; + +import lombok.Data; + +/** + * @author wjh + * 2024/7/28 + */ +@Data +public class ChannelVO extends Channel{ +} From a6aebd38bb635a010363709f87b305f1cd18cb9e Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Fri, 6 Sep 2024 16:10:45 +0800 Subject: [PATCH 3/6] =?UTF-8?q?1.=20=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/ChannelWithdrawController.java | 101 ++++++++ .../system/SmChannelController.java | 174 +++++++------ .../java/com/ruoyi/system/domain/Channel.java | 22 +- .../ruoyi/system/domain/ChannelWithdraw.java | 60 +++++ .../system/domain/ChannelWithdrawQuery.java | 18 ++ .../system/domain/ChannelWithdrawVO.java | 11 + .../ruoyi/system/mapper/ChannelMapper.java | 102 ++++---- .../system/mapper/ChannelWithdrawMapper.java | 65 +++++ .../NonNullDecimalTypeHandler.java | 43 ++++ .../ruoyi/system/service/ChannelService.java | 164 ++++++------ .../service/ChannelWithdrawService.java | 69 +++++ .../service/impl/ChannelServiceImpl.java | 243 +++++++++--------- .../impl/ChannelWithdrawServiceImpl.java | 114 ++++++++ .../resources/mapper/system/ChannelMapper.xml | 146 +++++------ .../mapper/system/ChannelWithdrawMapper.xml | 105 ++++++++ 15 files changed, 1003 insertions(+), 434 deletions(-) create mode 100644 electripper-admin/src/main/java/com/ruoyi/web/controller/system/ChannelWithdrawController.java create mode 100644 electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdraw.java create mode 100644 electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdrawQuery.java create mode 100644 electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdrawVO.java create mode 100644 electripper-system/src/main/java/com/ruoyi/system/mapper/ChannelWithdrawMapper.java create mode 100644 electripper-system/src/main/java/com/ruoyi/system/mapper/typehandler/NonNullDecimalTypeHandler.java create mode 100644 electripper-system/src/main/java/com/ruoyi/system/service/ChannelWithdrawService.java create mode 100644 electripper-system/src/main/java/com/ruoyi/system/service/impl/ChannelWithdrawServiceImpl.java create mode 100644 electripper-system/src/main/resources/mapper/system/ChannelWithdrawMapper.xml diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/ChannelWithdrawController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/ChannelWithdrawController.java new file mode 100644 index 0000000..d5f076d --- /dev/null +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/ChannelWithdrawController.java @@ -0,0 +1,101 @@ +package com.ruoyi.web.controller.system; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.domain.ChannelWithdraw; +import com.ruoyi.system.domain.ChannelWithdrawQuery; +import com.ruoyi.system.domain.ChannelWithdrawVO; +import com.ruoyi.system.service.ChannelWithdrawService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 提现渠道Controller + * + * @author ruoyi + * @date 2024-08-02 + */ +@RestController +@RequestMapping("/ss/channelWithdraw") +public class ChannelWithdrawController extends BaseController +{ + @Autowired + private ChannelWithdrawService channelWithdrawService; + + /** + * 查询提现渠道列表 + */ + @PreAuthorize("@ss.hasPermi('ss:channelWithdraw:list')") + @GetMapping("/list") + public TableDataInfo list(ChannelWithdrawQuery query) + { + startPage(); + startOrderBy(); + List list = channelWithdrawService.selectChannelWithdrawList(query); + return getDataTable(list); + } + + /** + * 导出提现渠道列表 + */ + @PreAuthorize("@ss.hasPermi('ss:channelWithdraw:export')") + @Log(title = "提现渠道", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ChannelWithdrawQuery query) + { + List list = channelWithdrawService.selectChannelWithdrawList(query); + ExcelUtil util = new ExcelUtil(ChannelWithdrawVO.class); + util.exportExcel(response, list, "提现渠道数据"); + } + + /** + * 获取提现渠道详细信息 + */ + @PreAuthorize("@ss.hasPermi('ss:channelWithdraw:query')") + @GetMapping(value = "/{channelId}") + public AjaxResult getInfo(@PathVariable("channelId") Long channelId) + { + return success(channelWithdrawService.selectChannelWithdrawByChannelId(channelId)); + } + + /** + * 新增提现渠道 + */ + @PreAuthorize("@ss.hasPermi('ss:channelWithdraw:add')") + @Log(title = "提现渠道", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ChannelWithdraw channelWithdraw) + { + return toAjax(channelWithdrawService.insertChannelWithdraw(channelWithdraw)); + } + + /** + * 修改提现渠道 + */ + @PreAuthorize("@ss.hasPermi('ss:channelWithdraw:edit')") + @Log(title = "提现渠道", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ChannelWithdraw channelWithdraw) + { + return toAjax(channelWithdrawService.updateChannelWithdraw(channelWithdraw)); + } + + /** + * 删除提现渠道 + */ + @PreAuthorize("@ss.hasPermi('ss:channelWithdraw:remove')") + @Log(title = "提现渠道", businessType = BusinessType.DELETE) + @DeleteMapping("/{channelIds}") + public AjaxResult remove(@PathVariable Long[] channelIds) + { + return toAjax(channelWithdrawService.deleteChannelWithdrawByChannelIds(channelIds)); + } +} diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SmChannelController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SmChannelController.java index 6b07c93..abc5c54 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SmChannelController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SmChannelController.java @@ -1,88 +1,86 @@ -//package com.ruoyi.web.controller.system; -// -//import com.ruoyi.common.annotation.Log; -//import com.ruoyi.common.core.controller.BaseController; -//import com.ruoyi.common.core.domain.AjaxResult; -//import com.ruoyi.common.core.domain.ValidGroup; -//import com.ruoyi.common.core.page.TableDataInfo; -//import com.ruoyi.common.enums.BusinessType; -//import com.ruoyi.common.utils.poi.ExcelUtil; -//import com.ruoyi.ss.channel.domain.Channel; -//import com.ruoyi.ss.channel.domain.ChannelQuery; -//import com.ruoyi.ss.channel.domain.ChannelVO; -//import com.ruoyi.ss.channel.service.ChannelService; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.security.access.prepost.PreAuthorize; -//import org.springframework.validation.annotation.Validated; -//import org.springframework.web.bind.annotation.*; -// -//import javax.servlet.http.HttpServletResponse; -//import java.util.List; -// -///** -// * 充值渠道Controller -// * -// * @author ruoyi -// * @date 2024-04-15 -// */ -//@RestController -//@RequestMapping("/system/channel") -//public class SmChannelController extends BaseController -//{ -// @Autowired -// private ChannelService smChannelService; -// -// /** -// * 查询充值渠道列表 -// */ -// @PreAuthorize("@ss.hasPermi('system:channel:list')") -// @GetMapping("/list") -// public TableDataInfo list(ChannelQuery smChannel) -// { -// startPage(); -// List list = smChannelService.selectSmChannelList(smChannel); -// return getDataTable(list); -// } -// -// /** -// * 导出充值渠道列表 -// */ -// @PreAuthorize("@ss.hasPermi('system:channel:export')") -// @Log(title = "充值渠道", businessType = BusinessType.EXPORT) -// @PostMapping("/export") -// public void export(HttpServletResponse response, ChannelQuery smChannel) -// { -// List list = smChannelService.selectSmChannelList(smChannel); -// ExcelUtil util = new ExcelUtil(ChannelVO.class); -// util.exportExcel(response, list, "充值渠道数据"); -// } -// -// /** -// * 获取充值渠道详细信息 -// */ -// @PreAuthorize("@ss.hasPermi('system:channel:query')") -// @GetMapping(value = "/{channelId}") -// public AjaxResult getInfo(@PathVariable("channelId") Long channelId) -// { -// return success(smChannelService.selectSmChannelByChannelId(channelId)); -// } -// -// /** -// * 修改充值渠道 -// */ -// @PreAuthorize("@ss.hasPermi('system:channel:edit')") -// @Log(title = "充值渠道", businessType = BusinessType.UPDATE) -// @PutMapping -// public AjaxResult edit(@RequestBody @Validated(ValidGroup.Update.class) Channel form) -// { -// Channel channel = new Channel(); -// channel.setChannelId(form.getChannelId()); -// channel.setEnabled(form.getEnabled()); -// channel.setServiceRate(form.getServiceRate()); -// channel.setCostRate(form.getCostRate()); -// channel.setServiceType(form.getServiceType()); -// channel.setPicture(form.getPicture()); -// return toAjax(smChannelService.updateSmChannel(channel)); -// } -// -//} +package com.ruoyi.web.controller.system; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.ValidGroup; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.domain.Channel; +import com.ruoyi.system.domain.ChannelQuery; +import com.ruoyi.system.domain.ChannelVO; +import com.ruoyi.system.service.ChannelService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 充值渠道Controller + * + * @author ruoyi + * @date 2024-04-15 + */ +@RestController +@RequestMapping("/system/channel") +public class SmChannelController extends BaseController +{ + @Autowired + private ChannelService smChannelService; + + /** + * 查询充值渠道列表 + */ + @PreAuthorize("@ss.hasPermi('system:channel:list')") + @GetMapping("/list") + public TableDataInfo list(ChannelQuery smChannel) + { + startPage(); + List list = smChannelService.selectSmChannelList(smChannel); + return getDataTable(list); + } + + /** + * 导出充值渠道列表 + */ + @PreAuthorize("@ss.hasPermi('system:channel:export')") + @Log(title = "充值渠道", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ChannelQuery smChannel) + { + List list = smChannelService.selectSmChannelList(smChannel); + ExcelUtil util = new ExcelUtil(ChannelVO.class); + util.exportExcel(response, list, "充值渠道数据"); + } + + /** + * 获取充值渠道详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:channel:query')") + @GetMapping(value = "/{channelId}") + public AjaxResult getInfo(@PathVariable("channelId") Long channelId) + { + return success(smChannelService.selectSmChannelByChannelId(channelId)); + } + + /** + * 修改充值渠道 + */ + @PreAuthorize("@ss.hasPermi('system:channel:edit')") + @Log(title = "充值渠道", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody @Validated(ValidGroup.Update.class) Channel form) + { + Channel channel = new Channel(); + channel.setChannelId(form.getChannelId()); + channel.setEnabled(form.getEnabled()); + channel.setCostRate(form.getCostRate()); + channel.setPicture(form.getPicture()); + return toAjax(smChannelService.updateSmChannel(channel)); + } + +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/Channel.java b/electripper-system/src/main/java/com/ruoyi/system/domain/Channel.java index 32f87a4..d6775e7 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/Channel.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/Channel.java @@ -3,7 +3,7 @@ package com.ruoyi.system.domain; import com.fasterxml.jackson.annotation.JsonView; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.core.domain.JsonViewProfile; +//import com.ruoyi.common.core.domain.JsonViewProfile; import com.ruoyi.common.core.domain.ValidGroup; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,34 +23,34 @@ public class Channel extends BaseEntity private static final long serialVersionUID = 1L; /** 主键 */ - @JsonView(JsonViewProfile.App.class) +// @JsonView(JsonViewProfile.App.class) private Long channelId; /** 渠道名称 */ @Excel(name = "渠道名称") - @JsonView(JsonViewProfile.App.class) +// @JsonView(JsonViewProfile.App.class) private String name; /** 是否启用 */ @Excel(name = "是否启用") private Boolean enabled; - /** 服务费费率% */ - @Excel(name = "服务费费率%") - @Min(value = 0, message = "服务费费率不允许低于0", groups = {ValidGroup.Update.class}) - private BigDecimal serviceRate; +// /** 服务费费率% */ +// @Excel(name = "服务费费率%") +// @Min(value = 0, message = "服务费费率不允许低于0", groups = {ValidGroup.Update.class}) +// private BigDecimal serviceRate; /** 成本率% */ @Excel(name = "成本率%") @Min(value = 0, message = "成本率不允许低于0", groups = {ValidGroup.Update.class}) private BigDecimal costRate; - @Excel(name = "服务费类型") - @ApiModelProperty("服务费类型") - private String serviceType; +// @Excel(name = "服务费类型") +// @ApiModelProperty("服务费类型") +// private String serviceType; @ApiModelProperty("渠道图片") - @JsonView(JsonViewProfile.App.class) +// @JsonView(JsonViewProfile.App.class) private String picture; } diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdraw.java b/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdraw.java new file mode 100644 index 0000000..43dfcfc --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdraw.java @@ -0,0 +1,60 @@ +package com.ruoyi.system.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Min; +import java.math.BigDecimal; + +/** + * 提现渠道对象 ss_channel_withdraw + * + * @author ruoyi + * @date 2024-08-02 + */ +@Data +public class ChannelWithdraw extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + private Long channelId; + + @Excel(name = "渠道名称") + @ApiModelProperty("渠道名称") + private String name; + + @Excel(name = "对应账户类型") + @ApiModelProperty("对应账户类型") + private String accountType; + + @Excel(name = "服务费收取类型") + @ApiModelProperty("服务费收取类型") + private String serviceType; + + @Excel(name = "服务费") + @ApiModelProperty("服务费") + private BigDecimal serviceRate; + + @Excel(name = "是否启用") + @ApiModelProperty("是否启用") + private Boolean enabled; + + @Excel(name = "渠道成本率") + @ApiModelProperty("渠道成本率") + private BigDecimal costRate; + + @Excel(name = "图片") + @ApiModelProperty("图片") + private String picture; + + @ApiModelProperty("单笔最低提现金额") + @Min(value = 0, message = "单笔最低提现金额不能小于0") + private BigDecimal minAmount; + + @ApiModelProperty("单笔最高提现金额") + @Min(value = 0, message = "单笔最高提现金额不能小于0") + private BigDecimal maxAmount; + +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdrawQuery.java b/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdrawQuery.java new file mode 100644 index 0000000..fbfb8d8 --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdrawQuery.java @@ -0,0 +1,18 @@ +package com.ruoyi.system.domain; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author wjh + * 2024/8/2 + */ +@Data +public class ChannelWithdrawQuery extends ChannelWithdraw{ + + @ApiModelProperty("账户类型列表") + private List accountTypes; + +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdrawVO.java b/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdrawVO.java new file mode 100644 index 0000000..fd5780c --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdrawVO.java @@ -0,0 +1,11 @@ +package com.ruoyi.system.domain; + +import lombok.Data; + +/** + * @author wjh + * 2024/8/2 + */ +@Data +public class ChannelWithdrawVO extends ChannelWithdraw{ +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java b/electripper-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java index 58826ee..9ef4923 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java +++ b/electripper-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java @@ -1,9 +1,9 @@ package com.ruoyi.system.mapper; -//import com.ruoyi.ss.channel.domain.Channel; -//import com.ruoyi.ss.channel.domain.ChannelQuery; -//import com.ruoyi.ss.channel.domain.ChannelVO; -//import org.apache.ibatis.annotations.Param; +import com.ruoyi.system.domain.Channel; +import com.ruoyi.system.domain.ChannelQuery; +import com.ruoyi.system.domain.ChannelVO; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -15,51 +15,51 @@ import java.util.List; */ public interface ChannelMapper { -// /** -// * 查询充值渠道 -// * -// * @param channelId 充值渠道主键 -// * @return 充值渠道 -// */ -// public ChannelVO selectSmChannelByChannelId(Long channelId); -// -// /** -// * 查询充值渠道列表 -// * -// * @param smChannel 充值渠道 -// * @return 充值渠道集合 -// */ -// public List selectSmChannelList(@Param("query") ChannelQuery smChannel); -// -// /** -// * 新增充值渠道 -// * -// * @param channel 充值渠道 -// * @return 结果 -// */ -// public int insertSmChannel(Channel channel); -// -// /** -// * 修改充值渠道 -// * -// * @param channel 充值渠道 -// * @return 结果 -// */ -// public int updateSmChannel(@Param("data") Channel channel); -// -// /** -// * 删除充值渠道 -// * -// * @param channelId 充值渠道主键 -// * @return 结果 -// */ -// public int deleteSmChannelByChannelId(Long channelId); -// -// /** -// * 批量删除充值渠道 -// * -// * @param channelIds 需要删除的数据主键集合 -// * @return 结果 -// */ -// public int deleteSmChannelByChannelIds(Long[] channelIds); + /** + * 查询充值渠道 + * + * @param channelId 充值渠道主键 + * @return 充值渠道 + */ + public ChannelVO selectSmChannelByChannelId(Long channelId); + + /** + * 查询充值渠道列表 + * + * @param smChannel 充值渠道 + * @return 充值渠道集合 + */ + public List selectSmChannelList(@Param("query") ChannelQuery smChannel); + + /** + * 新增充值渠道 + * + * @param channel 充值渠道 + * @return 结果 + */ + public int insertSmChannel(Channel channel); + + /** + * 修改充值渠道 + * + * @param channel 充值渠道 + * @return 结果 + */ + public int updateSmChannel(@Param("data") Channel channel); + + /** + * 删除充值渠道 + * + * @param channelId 充值渠道主键 + * @return 结果 + */ + public int deleteSmChannelByChannelId(Long channelId); + + /** + * 批量删除充值渠道 + * + * @param channelIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSmChannelByChannelIds(Long[] channelIds); } diff --git a/electripper-system/src/main/java/com/ruoyi/system/mapper/ChannelWithdrawMapper.java b/electripper-system/src/main/java/com/ruoyi/system/mapper/ChannelWithdrawMapper.java new file mode 100644 index 0000000..d2bd489 --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/mapper/ChannelWithdrawMapper.java @@ -0,0 +1,65 @@ +package com.ruoyi.system.mapper; + +import com.ruoyi.system.domain.ChannelWithdraw; +import com.ruoyi.system.domain.ChannelWithdrawQuery; +import com.ruoyi.system.domain.ChannelWithdrawVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 提现渠道Mapper接口 + * + * @author ruoyi + * @date 2024-08-02 + */ +public interface ChannelWithdrawMapper +{ + /** + * 查询提现渠道 + * + * @param channelId 提现渠道主键 + * @return 提现渠道 + */ + public ChannelWithdrawVO selectChannelWithdrawByChannelId(Long channelId); + + /** + * 查询提现渠道列表 + * + * @param query 提现渠道 + * @return 提现渠道集合 + */ + public List selectChannelWithdrawList(@Param("query") ChannelWithdrawQuery query); + + /** + * 新增提现渠道 + * + * @param channelWithdraw 提现渠道 + * @return 结果 + */ + public int insertChannelWithdraw(ChannelWithdraw channelWithdraw); + + /** + * 修改提现渠道 + * + * @param channelWithdraw 提现渠道 + * @return 结果 + */ + public int updateChannelWithdraw(@Param("data") ChannelWithdraw channelWithdraw); + + /** + * 删除提现渠道 + * + * @param channelId 提现渠道主键 + * @return 结果 + */ + public int deleteChannelWithdrawByChannelId(Long channelId); + + /** + * 批量删除提现渠道 + * + * @param channelIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteChannelWithdrawByChannelIds(Long[] channelIds); +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/mapper/typehandler/NonNullDecimalTypeHandler.java b/electripper-system/src/main/java/com/ruoyi/system/mapper/typehandler/NonNullDecimalTypeHandler.java new file mode 100644 index 0000000..36cd42c --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/mapper/typehandler/NonNullDecimalTypeHandler.java @@ -0,0 +1,43 @@ +package com.ruoyi.system.mapper.typehandler; + +import org.apache.ibatis.type.BaseTypeHandler; +import org.apache.ibatis.type.JdbcType; + +import java.math.BigDecimal; +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + +/** + * 非空BigDecimal类型处理器，为空时，返回0 + * @author wjh + * 2024/3/30 + */ +public class NonNullDecimalTypeHandler extends BaseTypeHandler { + + @Override + public void setNonNullParameter(PreparedStatement ps, int i, BigDecimal parameter, JdbcType jdbcType) throws SQLException { + ps.setBigDecimal(i, parameter); + } + + @Override + public BigDecimal getNullableResult(ResultSet rs, String columnName) + throws SQLException { + BigDecimal data = rs.getBigDecimal(columnName); + return data == null ? BigDecimal.ZERO : data; + } + + @Override + public BigDecimal getNullableResult(ResultSet rs, int columnIndex) throws SQLException { + BigDecimal data = rs.getBigDecimal(columnIndex); + return data == null ? BigDecimal.ZERO : data; + } + + @Override + public BigDecimal getNullableResult(CallableStatement cs, int columnIndex) + throws SQLException { + BigDecimal data = cs.getBigDecimal(columnIndex); + return data == null ? BigDecimal.ZERO : data; + } +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/ChannelService.java b/electripper-system/src/main/java/com/ruoyi/system/service/ChannelService.java index 817a1fe..15aa168 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/ChannelService.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/ChannelService.java @@ -1,82 +1,82 @@ -//package com.ruoyi.system.service; -// -//import com.ruoyi.ss.channel.domain.Channel; -//import com.ruoyi.ss.channel.domain.ChannelQuery; -//import com.ruoyi.ss.channel.domain.ChannelVO; -// -//import java.util.List; -//import java.util.Map; -//import java.util.function.Function; -// -///** -// * 充值渠道Service接口 -// * -// * @author ruoyi -// * @date 2024-04-15 -// */ -//public interface ChannelService -//{ -// /** -// * 查询充值渠道 -// * -// * @param channelId 充值渠道主键 -// * @return 充值渠道 -// */ -// public ChannelVO selectSmChannelByChannelId(Long channelId); -// -// /** -// * 查询充值渠道列表 -// * -// * @param smChannel 充值渠道 -// * @return 充值渠道集合 -// */ -// public List selectSmChannelList(ChannelQuery smChannel); -// -// /** -// * 新增充值渠道 -// * -// * @param channel 充值渠道 -// * @return 结果 -// */ -// public int insertSmChannel(Channel channel); -// -// /** -// * 修改充值渠道 -// * -// * @param channel 充值渠道 -// * @return 结果 -// */ -// public int updateSmChannel(Channel channel); -// -// /** -// * 批量删除充值渠道 -// * -// * @param channelIds 需要删除的充值渠道主键集合 -// * @return 结果 -// */ -// public int deleteSmChannelByChannelIds(Long[] channelIds); -// -// /** -// * 删除充值渠道信息 -// * -// * @param channelId 充值渠道主键 -// * @return 结果 -// */ -// public int deleteSmChannelByChannelId(Long channelId); -// -// /** -// * 查询启用的充值渠道列表 -// * -// * @return -// */ -// List selectEnabledRechargeList(); -// -// /** -// * 查询充值渠道映射表 -// * -// * @param query 查询条件 -// * @param keyMapper 映射函数 -// */ -// Map selectMap(ChannelQuery query, Function keyMapper); -// -//} +package com.ruoyi.system.service; + +import com.ruoyi.system.domain.Channel; +import com.ruoyi.system.domain.ChannelQuery; +import com.ruoyi.system.domain.ChannelVO; + +import java.util.List; +import java.util.Map; +import java.util.function.Function; + +/** + * 充值渠道Service接口 + * + * @author ruoyi + * @date 2024-04-15 + */ +public interface ChannelService +{ + /** + * 查询充值渠道 + * + * @param channelId 充值渠道主键 + * @return 充值渠道 + */ + public ChannelVO selectSmChannelByChannelId(Long channelId); + + /** + * 查询充值渠道列表 + * + * @param smChannel 充值渠道 + * @return 充值渠道集合 + */ + public List selectSmChannelList(ChannelQuery smChannel); + + /** + * 新增充值渠道 + * + * @param channel 充值渠道 + * @return 结果 + */ + public int insertSmChannel(Channel channel); + + /** + * 修改充值渠道 + * + * @param channel 充值渠道 + * @return 结果 + */ + public int updateSmChannel(Channel channel); + + /** + * 批量删除充值渠道 + * + * @param channelIds 需要删除的充值渠道主键集合 + * @return 结果 + */ + public int deleteSmChannelByChannelIds(Long[] channelIds); + + /** + * 删除充值渠道信息 + * + * @param channelId 充值渠道主键 + * @return 结果 + */ + public int deleteSmChannelByChannelId(Long channelId); + + /** + * 查询启用的充值渠道列表 + * + * @return + */ + List selectEnabledRechargeList(); + + /** + * 查询充值渠道映射表 + * + * @param query 查询条件 + * @param keyMapper 映射函数 + */ + Map selectMap(ChannelQuery query, Function keyMapper); + +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/ChannelWithdrawService.java b/electripper-system/src/main/java/com/ruoyi/system/service/ChannelWithdrawService.java new file mode 100644 index 0000000..c50546d --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/service/ChannelWithdrawService.java @@ -0,0 +1,69 @@ +package com.ruoyi.system.service; + +import com.ruoyi.system.domain.ChannelWithdraw; +import com.ruoyi.system.domain.ChannelWithdrawQuery; +import com.ruoyi.system.domain.ChannelWithdrawVO; + +import java.util.List; + +/** + * 提现渠道Service接口 + * + * @author ruoyi + * @date 2024-08-02 + */ +public interface ChannelWithdrawService +{ + /** + * 查询提现渠道 + * + * @param channelId 提现渠道主键 + * @return 提现渠道 + */ + public ChannelWithdrawVO selectChannelWithdrawByChannelId(Long channelId); + + /** + * 查询提现渠道列表 + * + * @param channelWithdraw 提现渠道 + * @return 提现渠道集合 + */ + public List selectChannelWithdrawList(ChannelWithdrawQuery channelWithdraw); + + /** + * 新增提现渠道 + * + * @param channelWithdraw 提现渠道 + * @return 结果 + */ + public int insertChannelWithdraw(ChannelWithdraw channelWithdraw); + + /** + * 修改提现渠道 + * + * @param channelWithdraw 提现渠道 + * @return 结果 + */ + public int updateChannelWithdraw(ChannelWithdraw channelWithdraw); + + /** + * 批量删除提现渠道 + * + * @param channelIds 需要删除的提现渠道主键集合 + * @return 结果 + */ + public int deleteChannelWithdrawByChannelIds(Long[] channelIds); + + /** + * 删除提现渠道信息 + * + * @param channelId 提现渠道主键 + * @return 结果 + */ + public int deleteChannelWithdrawByChannelId(Long channelId); + + /** + * 查询用户可用的提现渠道 + */ + List selectEnabledList(Long userId); +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java index f6d2cb1..d52e8c4 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java @@ -1,127 +1,122 @@ -//package com.ruoyi.system.service.impl; -// -//import com.ruoyi.common.utils.collection.CollectionUtils; -//import com.ruoyi.ss.account.service.AccountService; -//import com.ruoyi.ss.channel.domain.Channel; -//import com.ruoyi.ss.channel.domain.ChannelQuery; -//import com.ruoyi.ss.channel.domain.ChannelVO; -//import com.ruoyi.ss.channel.mapper.ChannelMapper; -//import com.ruoyi.ss.channel.service.ChannelService; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Service; -// -//import java.util.Collections; -//import java.util.List; -//import java.util.Map; -//import java.util.function.Function; -//import java.util.stream.Collectors; -// -///** -// * 充值渠道Service业务层处理 -// * -// * @author ruoyi -// * @date 2024-04-15 -// */ -//@Service -//public class ChannelServiceImpl implements ChannelService -//{ -// @Autowired -// private ChannelMapper channelMapper; -// -// @Autowired -// private AccountService accountService; -// -// /** -// * 查询充值渠道 -// * -// * @param channelId 充值渠道主键 -// * @return 充值渠道 -// */ -// @Override -// public ChannelVO selectSmChannelByChannelId(Long channelId) -// { -// return channelMapper.selectSmChannelByChannelId(channelId); -// } -// -// /** -// * 查询充值渠道列表 -// * -// * @param smChannel 充值渠道 -// * @return 充值渠道 -// */ -// @Override -// public List selectSmChannelList(ChannelQuery smChannel) -// { -// return channelMapper.selectSmChannelList(smChannel); -// } -// -// /** -// * 新增充值渠道 -// * -// * @param channel 充值渠道 -// * @return 结果 -// */ -// @Override -// public int insertSmChannel(Channel channel) -// { -// return channelMapper.insertSmChannel(channel); -// } -// -// /** -// * 修改充值渠道 -// * -// * @param channel 充值渠道 -// * @return 结果 -// */ -// @Override -// public int updateSmChannel(Channel channel) -// { -// return channelMapper.updateSmChannel(channel); -// } -// -// /** -// * 批量删除充值渠道 -// * -// * @param channelIds 需要删除的充值渠道主键 -// * @return 结果 -// */ -// @Override -// public int deleteSmChannelByChannelIds(Long[] channelIds) -// { -// return channelMapper.deleteSmChannelByChannelIds(channelIds); -// } -// -// /** -// * 删除充值渠道信息 -// * -// * @param channelId 充值渠道主键 -// * @return 结果 -// */ -// @Override -// public int deleteSmChannelByChannelId(Long channelId) -// { -// return channelMapper.deleteSmChannelByChannelId(channelId); -// } -// -// @Override -// public List selectEnabledRechargeList() { -// ChannelQuery dto = new ChannelQuery(); -// dto.setEnabled(true); -// return this.selectSmChannelList(dto); -// } -// -// /** -// * 查询充值渠道映射表 -// * -// * @param query 查询条件 -// * @param keyMapper 映射函数 -// */ -// @Override -// public Map selectMap(ChannelQuery query, Function keyMapper) { -// List list = this.selectSmChannelList(query); +package com.ruoyi.system.service.impl; + +import com.ruoyi.system.domain.Channel; +import com.ruoyi.system.domain.ChannelQuery; +import com.ruoyi.system.domain.ChannelVO; +import com.ruoyi.system.mapper.ChannelMapper; +import com.ruoyi.system.service.ChannelService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * 充值渠道Service业务层处理 + * + * @author ruoyi + * @date 2024-04-15 + */ +@Service +public class ChannelServiceImpl implements ChannelService +{ + @Resource + private ChannelMapper channelMapper; + + /** + * 查询充值渠道 + * + * @param channelId 充值渠道主键 + * @return 充值渠道 + */ + @Override + public ChannelVO selectSmChannelByChannelId(Long channelId) + { + return channelMapper.selectSmChannelByChannelId(channelId); + } + + /** + * 查询充值渠道列表 + * + * @param smChannel 充值渠道 + * @return 充值渠道 + */ + @Override + public List selectSmChannelList(ChannelQuery smChannel) + { + return channelMapper.selectSmChannelList(smChannel); + } + + /** + * 新增充值渠道 + * + * @param channel 充值渠道 + * @return 结果 + */ + @Override + public int insertSmChannel(Channel channel) + { + return channelMapper.insertSmChannel(channel); + } + + /** + * 修改充值渠道 + * + * @param channel 充值渠道 + * @return 结果 + */ + @Override + public int updateSmChannel(Channel channel) + { + return channelMapper.updateSmChannel(channel); + } + + /** + * 批量删除充值渠道 + * + * @param channelIds 需要删除的充值渠道主键 + * @return 结果 + */ + @Override + public int deleteSmChannelByChannelIds(Long[] channelIds) + { + return channelMapper.deleteSmChannelByChannelIds(channelIds); + } + + /** + * 删除充值渠道信息 + * + * @param channelId 充值渠道主键 + * @return 结果 + */ + @Override + public int deleteSmChannelByChannelId(Long channelId) + { + return channelMapper.deleteSmChannelByChannelId(channelId); + } + + @Override + public List selectEnabledRechargeList() { + ChannelQuery dto = new ChannelQuery(); + dto.setEnabled(true); + return this.selectSmChannelList(dto); + } + + /** + * 查询充值渠道映射表 + * + * @param query 查询条件 + * @param keyMapper 映射函数 + */ + @Override + public Map selectMap(ChannelQuery query, Function keyMapper) { + List list = this.selectSmChannelList(query); // if (CollectionUtils.isEmptyElement(list)) { // return Collections.emptyMap(); // } -// return list.stream().collect(Collectors.toMap(keyMapper, item -> item)); -// } -//} + return list.stream().collect(Collectors.toMap(keyMapper, item -> item)); + } +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/ChannelWithdrawServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/ChannelWithdrawServiceImpl.java new file mode 100644 index 0000000..ab7025d --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/ChannelWithdrawServiceImpl.java @@ -0,0 +1,114 @@ +package com.ruoyi.system.service.impl; + +import com.ruoyi.system.domain.ChannelWithdraw; +import com.ruoyi.system.domain.ChannelWithdrawQuery; +import com.ruoyi.system.domain.ChannelWithdrawVO; +import com.ruoyi.system.mapper.ChannelWithdrawMapper; +import com.ruoyi.system.service.ChannelWithdrawService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 提现渠道Service业务层处理 + * + * @author ruoyi + * @date 2024-08-02 + */ +@Service +public class ChannelWithdrawServiceImpl implements ChannelWithdrawService +{ + @Resource + private ChannelWithdrawMapper channelWithdrawMapper; + +// @Autowired +// private AccountService accountService; + + /** + * 查询提现渠道 + * + * @param channelId 提现渠道主键 + * @return 提现渠道 + */ + @Override + public ChannelWithdrawVO selectChannelWithdrawByChannelId(Long channelId) + { + return channelWithdrawMapper.selectChannelWithdrawByChannelId(channelId); + } + + /** + * 查询提现渠道列表 + * + * @param channelWithdraw 提现渠道 + * @return 提现渠道 + */ + @Override + public List selectChannelWithdrawList(ChannelWithdrawQuery channelWithdraw) + { + return channelWithdrawMapper.selectChannelWithdrawList(channelWithdraw); + } + + /** + * 新增提现渠道 + * + * @param channelWithdraw 提现渠道 + * @return 结果 + */ + @Override + public int insertChannelWithdraw(ChannelWithdraw channelWithdraw) + { + return channelWithdrawMapper.insertChannelWithdraw(channelWithdraw); + } + + /** + * 修改提现渠道 + * + * @param channelWithdraw 提现渠道 + * @return 结果 + */ + @Override + public int updateChannelWithdraw(ChannelWithdraw channelWithdraw) + { + return channelWithdrawMapper.updateChannelWithdraw(channelWithdraw); + } + + /** + * 批量删除提现渠道 + * + * @param channelIds 需要删除的提现渠道主键 + * @return 结果 + */ + @Override + public int deleteChannelWithdrawByChannelIds(Long[] channelIds) + { + return channelWithdrawMapper.deleteChannelWithdrawByChannelIds(channelIds); + } + + /** + * 删除提现渠道信息 + * + * @param channelId 提现渠道主键 + * @return 结果 + */ + @Override + public int deleteChannelWithdrawByChannelId(Long channelId) + { + return channelWithdrawMapper.deleteChannelWithdrawByChannelId(channelId); + } + + @Override + public List selectEnabledList(Long userId) { + // 查询用户账户列表 +// List accountList = accountService.selectByUserId(userId); +// if (CollectionUtils.isEmptyElement(accountList)) { +// return Collections.emptyList(); +// } + // 查询渠道列表 +// ChannelWithdrawQuery query = new ChannelWithdrawQuery(); +// query.setAccountTypes(CollectionUtils.map(accountList, AccountVO::getAccountType)); +// query.setEnabled(true); +// return this.selectChannelWithdrawList(query); + return null; + } +} diff --git a/electripper-system/src/main/resources/mapper/system/ChannelMapper.xml b/electripper-system/src/main/resources/mapper/system/ChannelMapper.xml index 56f9b6a..2bbbf5d 100644 --- a/electripper-system/src/main/resources/mapper/system/ChannelMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/ChannelMapper.xml @@ -4,90 +4,80 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - + + + - - - - - - - - - - - + + select + sc.channel_id, + sc.name, + sc.enabled, + sc.cost_rate, + sc.picture + from sm_channel sc + - - - - - - - - - - - + + and sc.name like concat('%', #{query.name}, '%') + and sc.enabled = #{query.enabled} + + and sc.channel_id in + + #{item} + + + - - - - - - + - - - - + - - - - - - - - - - - - - - - - - - - - - + + insert into sm_channel + + channel_id, + `name`, + enabled, + cost_rate, + picture, + + + #{channelId}, + #{name}, + #{enabled}, + #{costRate}, + #{picture}, + + - - - - - - - - - - - - + + update sm_channel + + name = #{data.name}, + enabled = #{data.enabled}, + cost_rate = #{data.costRate}, + picture = #{data.picture}, + + where channel_id = #{data.channelId} + - - - + + delete from sm_channel where channel_id = #{channelId} + - - - - - - + + delete from sm_channel where channel_id in + + #{channelId} + + diff --git a/electripper-system/src/main/resources/mapper/system/ChannelWithdrawMapper.xml b/electripper-system/src/main/resources/mapper/system/ChannelWithdrawMapper.xml new file mode 100644 index 0000000..5df3456 --- /dev/null +++ b/electripper-system/src/main/resources/mapper/system/ChannelWithdrawMapper.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + select + scw.channel_id, + scw.name, + scw.account_type, + scw.service_type, + scw.service_rate, + scw.enabled, + scw.cost_rate, + scw.picture, + scw.min_amount, + scw.max_amount + from ss_channel_withdraw scw + + + + and scw.channel_id = #{query.channelId} + and scw.name like concat('%', #{query.name}, '%') + and scw.account_type = #{query.accountType} + and scw.service_type = #{query.serviceType} + and scw.enabled = #{query.enabled} + + and scw.account_type in + + #{item} + + + + + + + + + + insert into ss_channel_withdraw + + name, + account_type, + service_type, + service_rate, + enabled, + cost_rate, + picture, + min_amount, + max_amount, + + + #{name}, + #{accountType}, + #{serviceType}, + #{serviceRate}, + #{enabled}, + #{costRate}, + #{picture}, + #{minAmount}, + #{maxAmount}, + + + + + update ss_channel_withdraw + + name = #{data.name}, + account_type = #{data.accountType}, + service_type = #{data.serviceType}, + service_rate = #{data.serviceRate}, + enabled = #{data.enabled}, + cost_rate = #{data.costRate}, + picture = #{data.picture}, + min_amount = #{data.minAmount}, + max_amount = #{data.maxAmount}, + + where channel_id = #{data.channelId} + + + + delete from ss_channel_withdraw where channel_id = #{channelId} + + + + delete from ss_channel_withdraw where channel_id in + + #{channelId} + + + From 2ae3c8e2799bb1b985e0eb7cb464845cec12bf54 Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Fri, 6 Sep 2024 17:10:37 +0800 Subject: [PATCH 4/6] =?UTF-8?q?1.=20=E6=B8=A0=E9=81=93=E7=B1=BB=E6=94=B9?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ntroller.java => EtChannelController.java} | 14 ++++++------- ....java => EtChannelWithdrawController.java} | 18 ++++++++-------- .../java/com/ruoyi/system/domain/Channel.java | 2 +- .../ruoyi/system/domain/ChannelWithdraw.java | 2 +- ...hannelMapper.java => EtChannelMapper.java} | 2 +- ...pper.java => EtChannelWithdrawMapper.java} | 2 +- ...nnelService.java => EtChannelService.java} | 2 +- ...ice.java => EtChannelWithdrawService.java} | 2 +- ...iceImpl.java => EtChannelServiceImpl.java} | 21 +++++++++---------- ...java => EtChannelWithdrawServiceImpl.java} | 20 +++++++++--------- ...{ChannelMapper.xml => EtChannelMapper.xml} | 12 +++++------ ...Mapper.xml => EtChannelWithdrawMapper.xml} | 12 +++++------ 12 files changed, 54 insertions(+), 55 deletions(-) rename electripper-admin/src/main/java/com/ruoyi/web/controller/system/{SmChannelController.java => EtChannelController.java} (83%) rename electripper-admin/src/main/java/com/ruoyi/web/controller/system/{ChannelWithdrawController.java => EtChannelWithdrawController.java} (78%) rename electripper-system/src/main/java/com/ruoyi/system/mapper/{ChannelMapper.java => EtChannelMapper.java} (97%) rename electripper-system/src/main/java/com/ruoyi/system/mapper/{ChannelWithdrawMapper.java => EtChannelWithdrawMapper.java} (97%) rename electripper-system/src/main/java/com/ruoyi/system/service/{ChannelService.java => EtChannelService.java} (98%) rename electripper-system/src/main/java/com/ruoyi/system/service/{ChannelWithdrawService.java => EtChannelWithdrawService.java} (97%) rename electripper-system/src/main/java/com/ruoyi/system/service/impl/{ChannelServiceImpl.java => EtChannelServiceImpl.java} (79%) rename electripper-system/src/main/java/com/ruoyi/system/service/impl/{ChannelWithdrawServiceImpl.java => EtChannelWithdrawServiceImpl.java} (76%) rename electripper-system/src/main/resources/mapper/system/{ChannelMapper.xml => EtChannelMapper.xml} (92%) rename electripper-system/src/main/resources/mapper/system/{ChannelWithdrawMapper.xml => EtChannelWithdrawMapper.xml} (94%) diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SmChannelController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtChannelController.java similarity index 83% rename from electripper-admin/src/main/java/com/ruoyi/web/controller/system/SmChannelController.java rename to electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtChannelController.java index abc5c54..c49397c 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SmChannelController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtChannelController.java @@ -10,7 +10,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.Channel; import com.ruoyi.system.domain.ChannelQuery; import com.ruoyi.system.domain.ChannelVO; -import com.ruoyi.system.service.ChannelService; +import com.ruoyi.system.service.EtChannelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -27,10 +27,10 @@ import java.util.List; */ @RestController @RequestMapping("/system/channel") -public class SmChannelController extends BaseController +public class EtChannelController extends BaseController { @Autowired - private ChannelService smChannelService; + private EtChannelService smEtChannelService; /** * 查询充值渠道列表 @@ -40,7 +40,7 @@ public class SmChannelController extends BaseController public TableDataInfo list(ChannelQuery smChannel) { startPage(); - List list = smChannelService.selectSmChannelList(smChannel); + List list = smEtChannelService.selectSmChannelList(smChannel); return getDataTable(list); } @@ -52,7 +52,7 @@ public class SmChannelController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, ChannelQuery smChannel) { - List list = smChannelService.selectSmChannelList(smChannel); + List list = smEtChannelService.selectSmChannelList(smChannel); ExcelUtil util = new ExcelUtil(ChannelVO.class); util.exportExcel(response, list, "充值渠道数据"); } @@ -64,7 +64,7 @@ public class SmChannelController extends BaseController @GetMapping(value = "/{channelId}") public AjaxResult getInfo(@PathVariable("channelId") Long channelId) { - return success(smChannelService.selectSmChannelByChannelId(channelId)); + return success(smEtChannelService.selectSmChannelByChannelId(channelId)); } /** @@ -80,7 +80,7 @@ public class SmChannelController extends BaseController channel.setEnabled(form.getEnabled()); channel.setCostRate(form.getCostRate()); channel.setPicture(form.getPicture()); - return toAjax(smChannelService.updateSmChannel(channel)); + return toAjax(smEtChannelService.updateSmChannel(channel)); } } diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/ChannelWithdrawController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtChannelWithdrawController.java similarity index 78% rename from electripper-admin/src/main/java/com/ruoyi/web/controller/system/ChannelWithdrawController.java rename to electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtChannelWithdrawController.java index d5f076d..68fd8b6 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/ChannelWithdrawController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtChannelWithdrawController.java @@ -9,7 +9,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.ChannelWithdraw; import com.ruoyi.system.domain.ChannelWithdrawQuery; import com.ruoyi.system.domain.ChannelWithdrawVO; -import com.ruoyi.system.service.ChannelWithdrawService; +import com.ruoyi.system.service.EtChannelWithdrawService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -25,10 +25,10 @@ import java.util.List; */ @RestController @RequestMapping("/ss/channelWithdraw") -public class ChannelWithdrawController extends BaseController +public class EtChannelWithdrawController extends BaseController { @Autowired - private ChannelWithdrawService channelWithdrawService; + private EtChannelWithdrawService etChannelWithdrawService; /** * 查询提现渠道列表 @@ -39,7 +39,7 @@ public class ChannelWithdrawController extends BaseController { startPage(); startOrderBy(); - List list = channelWithdrawService.selectChannelWithdrawList(query); + List list = etChannelWithdrawService.selectChannelWithdrawList(query); return getDataTable(list); } @@ -51,7 +51,7 @@ public class ChannelWithdrawController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, ChannelWithdrawQuery query) { - List list = channelWithdrawService.selectChannelWithdrawList(query); + List list = etChannelWithdrawService.selectChannelWithdrawList(query); ExcelUtil util = new ExcelUtil(ChannelWithdrawVO.class); util.exportExcel(response, list, "提现渠道数据"); } @@ -63,7 +63,7 @@ public class ChannelWithdrawController extends BaseController @GetMapping(value = "/{channelId}") public AjaxResult getInfo(@PathVariable("channelId") Long channelId) { - return success(channelWithdrawService.selectChannelWithdrawByChannelId(channelId)); + return success(etChannelWithdrawService.selectChannelWithdrawByChannelId(channelId)); } /** @@ -74,7 +74,7 @@ public class ChannelWithdrawController extends BaseController @PostMapping public AjaxResult add(@RequestBody ChannelWithdraw channelWithdraw) { - return toAjax(channelWithdrawService.insertChannelWithdraw(channelWithdraw)); + return toAjax(etChannelWithdrawService.insertChannelWithdraw(channelWithdraw)); } /** @@ -85,7 +85,7 @@ public class ChannelWithdrawController extends BaseController @PutMapping public AjaxResult edit(@RequestBody ChannelWithdraw channelWithdraw) { - return toAjax(channelWithdrawService.updateChannelWithdraw(channelWithdraw)); + return toAjax(etChannelWithdrawService.updateChannelWithdraw(channelWithdraw)); } /** @@ -96,6 +96,6 @@ public class ChannelWithdrawController extends BaseController @DeleteMapping("/{channelIds}") public AjaxResult remove(@PathVariable Long[] channelIds) { - return toAjax(channelWithdrawService.deleteChannelWithdrawByChannelIds(channelIds)); + return toAjax(etChannelWithdrawService.deleteChannelWithdrawByChannelIds(channelIds)); } } diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/Channel.java b/electripper-system/src/main/java/com/ruoyi/system/domain/Channel.java index d6775e7..3cdd8a1 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/Channel.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/Channel.java @@ -12,7 +12,7 @@ import javax.validation.constraints.Min; import java.math.BigDecimal; /** - * 充值渠道对象 sm_channel + * 充值渠道对象 et_channel * * @author ruoyi * @date 2024-04-15 diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdraw.java b/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdraw.java index 43dfcfc..4a4f0ca 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdraw.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdraw.java @@ -9,7 +9,7 @@ import javax.validation.constraints.Min; import java.math.BigDecimal; /** - * 提现渠道对象 ss_channel_withdraw + * 提现渠道对象 et_channel_withdraw * * @author ruoyi * @date 2024-08-02 diff --git a/electripper-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java b/electripper-system/src/main/java/com/ruoyi/system/mapper/EtChannelMapper.java similarity index 97% rename from electripper-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java rename to electripper-system/src/main/java/com/ruoyi/system/mapper/EtChannelMapper.java index 9ef4923..d38e5d5 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java +++ b/electripper-system/src/main/java/com/ruoyi/system/mapper/EtChannelMapper.java @@ -13,7 +13,7 @@ import java.util.List; * @author ruoyi * @date 2024-04-15 */ -public interface ChannelMapper +public interface EtChannelMapper { /** * 查询充值渠道 diff --git a/electripper-system/src/main/java/com/ruoyi/system/mapper/ChannelWithdrawMapper.java b/electripper-system/src/main/java/com/ruoyi/system/mapper/EtChannelWithdrawMapper.java similarity index 97% rename from electripper-system/src/main/java/com/ruoyi/system/mapper/ChannelWithdrawMapper.java rename to electripper-system/src/main/java/com/ruoyi/system/mapper/EtChannelWithdrawMapper.java index d2bd489..209f494 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/mapper/ChannelWithdrawMapper.java +++ b/electripper-system/src/main/java/com/ruoyi/system/mapper/EtChannelWithdrawMapper.java @@ -13,7 +13,7 @@ import java.util.List; * @author ruoyi * @date 2024-08-02 */ -public interface ChannelWithdrawMapper +public interface EtChannelWithdrawMapper { /** * 查询提现渠道 diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/ChannelService.java b/electripper-system/src/main/java/com/ruoyi/system/service/EtChannelService.java similarity index 98% rename from electripper-system/src/main/java/com/ruoyi/system/service/ChannelService.java rename to electripper-system/src/main/java/com/ruoyi/system/service/EtChannelService.java index 15aa168..a2a9172 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/ChannelService.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/EtChannelService.java @@ -14,7 +14,7 @@ import java.util.function.Function; * @author ruoyi * @date 2024-04-15 */ -public interface ChannelService +public interface EtChannelService { /** * 查询充值渠道 diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/ChannelWithdrawService.java b/electripper-system/src/main/java/com/ruoyi/system/service/EtChannelWithdrawService.java similarity index 97% rename from electripper-system/src/main/java/com/ruoyi/system/service/ChannelWithdrawService.java rename to electripper-system/src/main/java/com/ruoyi/system/service/EtChannelWithdrawService.java index c50546d..82fb45d 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/ChannelWithdrawService.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/EtChannelWithdrawService.java @@ -12,7 +12,7 @@ import java.util.List; * @author ruoyi * @date 2024-08-02 */ -public interface ChannelWithdrawService +public interface EtChannelWithdrawService { /** * 查询提现渠道 diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtChannelServiceImpl.java similarity index 79% rename from electripper-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java rename to electripper-system/src/main/java/com/ruoyi/system/service/impl/EtChannelServiceImpl.java index d52e8c4..7aa9ec2 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtChannelServiceImpl.java @@ -3,9 +3,8 @@ package com.ruoyi.system.service.impl; import com.ruoyi.system.domain.Channel; import com.ruoyi.system.domain.ChannelQuery; import com.ruoyi.system.domain.ChannelVO; -import com.ruoyi.system.mapper.ChannelMapper; -import com.ruoyi.system.service.ChannelService; -import org.springframework.beans.factory.annotation.Autowired; +import com.ruoyi.system.mapper.EtChannelMapper; +import com.ruoyi.system.service.EtChannelService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -21,10 +20,10 @@ import java.util.stream.Collectors; * @date 2024-04-15 */ @Service -public class ChannelServiceImpl implements ChannelService +public class EtChannelServiceImpl implements EtChannelService { @Resource - private ChannelMapper channelMapper; + private EtChannelMapper etChannelMapper; /** * 查询充值渠道 @@ -35,7 +34,7 @@ public class ChannelServiceImpl implements ChannelService @Override public ChannelVO selectSmChannelByChannelId(Long channelId) { - return channelMapper.selectSmChannelByChannelId(channelId); + return etChannelMapper.selectSmChannelByChannelId(channelId); } /** @@ -47,7 +46,7 @@ public class ChannelServiceImpl implements ChannelService @Override public List selectSmChannelList(ChannelQuery smChannel) { - return channelMapper.selectSmChannelList(smChannel); + return etChannelMapper.selectSmChannelList(smChannel); } /** @@ -59,7 +58,7 @@ public class ChannelServiceImpl implements ChannelService @Override public int insertSmChannel(Channel channel) { - return channelMapper.insertSmChannel(channel); + return etChannelMapper.insertSmChannel(channel); } /** @@ -71,7 +70,7 @@ public class ChannelServiceImpl implements ChannelService @Override public int updateSmChannel(Channel channel) { - return channelMapper.updateSmChannel(channel); + return etChannelMapper.updateSmChannel(channel); } /** @@ -83,7 +82,7 @@ public class ChannelServiceImpl implements ChannelService @Override public int deleteSmChannelByChannelIds(Long[] channelIds) { - return channelMapper.deleteSmChannelByChannelIds(channelIds); + return etChannelMapper.deleteSmChannelByChannelIds(channelIds); } /** @@ -95,7 +94,7 @@ public class ChannelServiceImpl implements ChannelService @Override public int deleteSmChannelByChannelId(Long channelId) { - return channelMapper.deleteSmChannelByChannelId(channelId); + return etChannelMapper.deleteSmChannelByChannelId(channelId); } @Override diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/ChannelWithdrawServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtChannelWithdrawServiceImpl.java similarity index 76% rename from electripper-system/src/main/java/com/ruoyi/system/service/impl/ChannelWithdrawServiceImpl.java rename to electripper-system/src/main/java/com/ruoyi/system/service/impl/EtChannelWithdrawServiceImpl.java index ab7025d..5c32610 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/ChannelWithdrawServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtChannelWithdrawServiceImpl.java @@ -3,8 +3,8 @@ package com.ruoyi.system.service.impl; import com.ruoyi.system.domain.ChannelWithdraw; import com.ruoyi.system.domain.ChannelWithdrawQuery; import com.ruoyi.system.domain.ChannelWithdrawVO; -import com.ruoyi.system.mapper.ChannelWithdrawMapper; -import com.ruoyi.system.service.ChannelWithdrawService; +import com.ruoyi.system.mapper.EtChannelWithdrawMapper; +import com.ruoyi.system.service.EtChannelWithdrawService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -17,10 +17,10 @@ import java.util.List; * @date 2024-08-02 */ @Service -public class ChannelWithdrawServiceImpl implements ChannelWithdrawService +public class EtChannelWithdrawServiceImpl implements EtChannelWithdrawService { @Resource - private ChannelWithdrawMapper channelWithdrawMapper; + private EtChannelWithdrawMapper etChannelWithdrawMapper; // @Autowired // private AccountService accountService; @@ -34,7 +34,7 @@ public class ChannelWithdrawServiceImpl implements ChannelWithdrawService @Override public ChannelWithdrawVO selectChannelWithdrawByChannelId(Long channelId) { - return channelWithdrawMapper.selectChannelWithdrawByChannelId(channelId); + return etChannelWithdrawMapper.selectChannelWithdrawByChannelId(channelId); } /** @@ -46,7 +46,7 @@ public class ChannelWithdrawServiceImpl implements ChannelWithdrawService @Override public List selectChannelWithdrawList(ChannelWithdrawQuery channelWithdraw) { - return channelWithdrawMapper.selectChannelWithdrawList(channelWithdraw); + return etChannelWithdrawMapper.selectChannelWithdrawList(channelWithdraw); } /** @@ -58,7 +58,7 @@ public class ChannelWithdrawServiceImpl implements ChannelWithdrawService @Override public int insertChannelWithdraw(ChannelWithdraw channelWithdraw) { - return channelWithdrawMapper.insertChannelWithdraw(channelWithdraw); + return etChannelWithdrawMapper.insertChannelWithdraw(channelWithdraw); } /** @@ -70,7 +70,7 @@ public class ChannelWithdrawServiceImpl implements ChannelWithdrawService @Override public int updateChannelWithdraw(ChannelWithdraw channelWithdraw) { - return channelWithdrawMapper.updateChannelWithdraw(channelWithdraw); + return etChannelWithdrawMapper.updateChannelWithdraw(channelWithdraw); } /** @@ -82,7 +82,7 @@ public class ChannelWithdrawServiceImpl implements ChannelWithdrawService @Override public int deleteChannelWithdrawByChannelIds(Long[] channelIds) { - return channelWithdrawMapper.deleteChannelWithdrawByChannelIds(channelIds); + return etChannelWithdrawMapper.deleteChannelWithdrawByChannelIds(channelIds); } /** @@ -94,7 +94,7 @@ public class ChannelWithdrawServiceImpl implements ChannelWithdrawService @Override public int deleteChannelWithdrawByChannelId(Long channelId) { - return channelWithdrawMapper.deleteChannelWithdrawByChannelId(channelId); + return etChannelWithdrawMapper.deleteChannelWithdrawByChannelId(channelId); } @Override diff --git a/electripper-system/src/main/resources/mapper/system/ChannelMapper.xml b/electripper-system/src/main/resources/mapper/system/EtChannelMapper.xml similarity index 92% rename from electripper-system/src/main/resources/mapper/system/ChannelMapper.xml rename to electripper-system/src/main/resources/mapper/system/EtChannelMapper.xml index 2bbbf5d..41d1272 100644 --- a/electripper-system/src/main/resources/mapper/system/ChannelMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/EtChannelMapper.xml @@ -2,7 +2,7 @@ - + @@ -15,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sc.enabled, sc.cost_rate, sc.picture - from sm_channel sc + from et_channel sc @@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into sm_channel + insert into et_channel channel_id, `name`, @@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sm_channel + update et_channel name = #{data.name}, enabled = #{data.enabled}, @@ -71,11 +71,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sm_channel where channel_id = #{channelId} + delete from et_channel where channel_id = #{channelId} - delete from sm_channel where channel_id in + delete from et_channel where channel_id in #{channelId} diff --git a/electripper-system/src/main/resources/mapper/system/ChannelWithdrawMapper.xml b/electripper-system/src/main/resources/mapper/system/EtChannelWithdrawMapper.xml similarity index 94% rename from electripper-system/src/main/resources/mapper/system/ChannelWithdrawMapper.xml rename to electripper-system/src/main/resources/mapper/system/EtChannelWithdrawMapper.xml index 5df3456..cdbad92 100644 --- a/electripper-system/src/main/resources/mapper/system/ChannelWithdrawMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/EtChannelWithdrawMapper.xml @@ -2,7 +2,7 @@ - + @@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" scw.picture, scw.min_amount, scw.max_amount - from ss_channel_withdraw scw + from et_channel_withdraw scw @@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into ss_channel_withdraw + insert into et_channel_withdraw name, account_type, @@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update ss_channel_withdraw + update et_channel_withdraw name = #{data.name}, account_type = #{data.accountType}, @@ -93,11 +93,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from ss_channel_withdraw where channel_id = #{channelId} + delete from et_channel_withdraw where channel_id = #{channelId} - delete from ss_channel_withdraw where channel_id in + delete from et_channel_withdraw where channel_id in #{channelId} From 4a1b01e3fec152a78e3bb2cb0283d8739874177e Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Mon, 9 Sep 2024 08:43:13 +0800 Subject: [PATCH 5/6] =?UTF-8?q?1.=20=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/system/domain/EtOrder.java | 18 +++++++++++++++ .../service/impl/CallbackServiceImpl.java | 15 +++++++++++- .../mapper/system/EtCapitalFlowMapper.xml | 4 ++-- .../resources/mapper/system/EtOrderMapper.xml | 23 +++++++++++++++---- 4 files changed, 53 insertions(+), 7 deletions(-) diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java index 5d88c55..f1b0518 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java @@ -304,4 +304,22 @@ public class EtOrder extends BaseEntity @Excel(name = "封顶金额") private BigDecimal cappedAmount; + /** 手续费 */ + @Excel(name = "手续费") + private BigDecimal handlingCharge; + + /** 平台服务费 */ + @Excel(name = "平台服务费") + private BigDecimal platformServiceFee; + + /** 运营商分账(到账金额) */ + @Excel(name = "运营商分账(到账金额)") + private BigDecimal operatorDividend; + + /** 成本 */ + @Excel(name = "成本") + @TableField(exist = false) + private BigDecimal cost; + + } diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java index 10ed840..a001322 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java @@ -230,6 +230,11 @@ public class CallbackServiceImpl implements CallbackService { asDevice.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE); // 新增资金流水记录 EtCapitalFlow capitalFlow = capitalFlowRecords(order, ServiceConstants.FLOW_TYPE_INCOME, ServiceConstants.ORDER_TYPE_RIDING, ServiceConstants.OWNER_TYPE_OPERATOR, null, ServiceConstants.PAY_TYPE_WX); + logger.info("=================【骑行支付回调-新增资金流水记录后】=================={}",JSON.toJSON(capitalFlow)); + order.setHandlingCharge(capitalFlow.getHandlingCharge()); + order.setPlatformServiceFee(capitalFlow.getPlatformServiceFee()); + order.setOperatorDividend(capitalFlow.getOperatorDividend()); + order.setCost(getCost(order.getPayFee())); // 发起分账 // BigDecimal dividendAmount= order.getPayFee().subtract(capitalFlow.getHandlingCharge()).subtract(capitalFlow.getPlatformServiceFee());//分账金额（订单实际支付金额-平台服务费-支付手续费） // logger.info("=================【微信支付回调】分账金额=================={}",dividendAmount); @@ -277,7 +282,7 @@ public class CallbackServiceImpl implements CallbackService { throw new ServiceException("【微信支付回调】更新车辆状态失败"); } } - logger.info("=================【微信支付回调】开始更新订单信息=================="); + logger.info("=================【微信支付回调】开始更新订单信息=================={}",JSON.toJSON(order)); int updateEtOrder = orderService.updateEtOrder(order); if(updateEtOrder==0){ logger.error("【微信支付回调】更新订单信息失败"); @@ -296,6 +301,14 @@ public class CallbackServiceImpl implements CallbackService { } } + private BigDecimal getCost(BigDecimal payFee) { + // todo 获取到微信的成本 + BigDecimal bigDecimal = new BigDecimal(0.54).divide(new BigDecimal(100), 6, BigDecimal.ROUND_HALF_UP); + BigDecimal cost = bigDecimal.multiply(payFee).setScale(2, BigDecimal.ROUND_HALF_UP); + logger.info("【保存资金流水记录--订单支付】 成本==============bigDecimal=====================："+bigDecimal); + return cost; + } + private void couponSuccessHandle(EtOrder order) { logger.info("【微信支付回调】优惠券支付-------------1"); /** diff --git a/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml b/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml index 17825e4..b634bdb 100644 --- a/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml @@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select - COALESCE(SUM(platform_service_fee), 0) AS net_fee + COALESCE(SUM(f.platform_service_fee), 0) AS net_fee from et_capital_flow f LEFT JOIN et_order o on o.order_no = f.order_no where f.area_id != 14 and f.type = 1 diff --git a/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml b/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml index 25f89a8..0122e44 100644 --- a/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml @@ -56,6 +56,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -65,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, appointment_start_time, appointment_end_time,appointment_timeout, unlock_time,return_time, rule_end_time, return_type, AsText(trip_route) trip_route,trip_route_str,cycle,deposit_deduction,video_url, upload_time,deduction_amount,audio_files,used_sn,change_reason,locking,auto_refund_deposit,free_ride_time, - rental_unit,riding_rule,riding_rule_json,charging_cycle,charging_cycle_value,capped_amount from et_order + rental_unit,riding_rule,riding_rule_json,charging_cycle,charging_cycle_value,capped_amount,handling_charge, platform_service_fee, operator_dividend from et_order @@ -74,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" manage_fee, riding_fee, appointment_fee, mark, duration, distance, status, create_time, appointment_start_time, appointment_end_time,appointment_timeout, unlock_time,return_time, rule_end_time, return_type, cycle,deposit_deduction,video_url,upload_time,deduction_amount,audio_files,used_sn,change_reason,locking,auto_refund_deposit,free_ride_time, - rental_unit,riding_rule,riding_rule_json,charging_cycle,charging_cycle_value,capped_amountfrom et_order + rental_unit,riding_rule,riding_rule_json,charging_cycle,charging_cycle_value,capped_amount,handling_charge, platform_service_fee, operator_dividend from et_order @@ -56,6 +58,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" result, latitude, longitude, + lat, + lon, call_status, order_no, create_by, @@ -71,6 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{result}, #{latitude}, #{longitude}, + #{lat}, + #{lon}, #{callStatus}, #{orderNo}, #{createBy}, @@ -90,6 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" result = #{result}, latitude = #{latitude}, longitude = #{longitude}, + lat = #{lat}, + lon = #{lon}, call_status = #{callStatus}, order_no = #{orderNo}, msg = #{msg},