1. 渠道类改名

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<ChannelVO> list = smChannelService.selectSmChannelList(smChannel);
+        List<ChannelVO> 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<ChannelVO> list = smChannelService.selectSmChannelList(smChannel);
+        List<ChannelVO> list = smEtChannelService.selectSmChannelList(smChannel);
         ExcelUtil<ChannelVO> util = new ExcelUtil<ChannelVO>(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));
     }
 
 }

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<ChannelWithdrawVO> list = channelWithdrawService.selectChannelWithdrawList(query);
+        List<ChannelWithdrawVO> 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<ChannelWithdrawVO> list = channelWithdrawService.selectChannelWithdrawList(query);
+        List<ChannelWithdrawVO> list = etChannelWithdrawService.selectChannelWithdrawList(query);
         ExcelUtil<ChannelWithdrawVO> util = new ExcelUtil<ChannelWithdrawVO>(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));
     }
 }

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

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

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
 {
     /**
      * 查询充值渠道

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
 {
     /**
      * 查询提现渠道

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
 {
     /**
      * 查询充值渠道

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
 {
     /**
      * 查询提现渠道

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.mapper.EtChannelMapper;
-import com.ruoyi.system.service.ChannelService;
+import com.ruoyi.system.service.EtChannelService;
-import org.springframework.beans.factory.annotation.Autowired;
 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<ChannelVO> 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

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.mapper.EtChannelWithdrawMapper;
-import com.ruoyi.system.service.ChannelWithdrawService;
+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<ChannelWithdrawVO> 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

electripper-system/src/main/resources/mapper/system/EtChannelMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.ChannelMapper">
+<mapper namespace="com.ruoyi.system.mapper.EtChannelMapper">
 
     <resultMap type="ChannelVO" id="SmChannelResult" autoMapping="true">
         <result property="costRate" column="cost_rate" typeHandler="com.ruoyi.system.mapper.typehandler.NonNullDecimalTypeHandler"/>
@@ -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
     </sql>
 
     <sql id="searchCondition">
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <insert id="insertSmChannel" parameterType="Channel">
-        insert into sm_channel
+        insert into et_channel
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="channelId != null">channel_id,</if>
             <if test="name != null">`name`,</if>
@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updateSmChannel" parameterType="Channel">
-        update sm_channel
+        update et_channel
         <trim prefix="SET" suffixOverrides=",">
             <if test="data.name != null">name = #{data.name},</if>
             <if test="data.enabled != null">enabled = #{data.enabled},</if>
@@ -71,11 +71,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteSmChannelByChannelId" parameterType="Long">
-        delete from sm_channel where channel_id = #{channelId}
+        delete from et_channel where channel_id = #{channelId}
     </delete>
 
     <delete id="deleteSmChannelByChannelIds" parameterType="String">
-        delete from sm_channel where channel_id in
+        delete from et_channel where channel_id in
         <foreach item="channelId" collection="array" open="(" separator="," close=")">
             #{channelId}
         </foreach>

electripper-system/src/main/resources/mapper/system/EtChannelWithdrawMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.ChannelWithdrawMapper">
+<mapper namespace="com.ruoyi.system.mapper.EtChannelWithdrawMapper">
 
     <resultMap type="ChannelWithdrawVO" id="ChannelWithdrawResult" autoMapping="true">
         <result property="serviceRate" column="service_rate" typeHandler="com.ruoyi.system.mapper.typehandler.NonNullDecimalTypeHandler"/>
@@ -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
     </sql>
 
     <sql id="searchCondition">
@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <insert id="insertChannelWithdraw" parameterType="ChannelWithdraw" useGeneratedKeys="true" keyProperty="channelId">
-        insert into ss_channel_withdraw
+        insert into et_channel_withdraw
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="name != null and name != ''">name,</if>
             <if test="accountType != null and accountType != ''">account_type,</if>
@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updateChannelWithdraw" parameterType="ChannelWithdraw">
-        update ss_channel_withdraw
+        update et_channel_withdraw
         <trim prefix="SET" suffixOverrides=",">
             <if test="data.name != null and data.name != ''">name = #{data.name},</if>
             <if test="data.accountType != null and data.accountType != ''">account_type = #{data.accountType},</if>
@@ -93,11 +93,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteChannelWithdrawByChannelId" parameterType="Long">
-        delete from ss_channel_withdraw where channel_id = #{channelId}
+        delete from et_channel_withdraw where channel_id = #{channelId}
     </delete>
 
     <delete id="deleteChannelWithdrawByChannelIds" parameterType="String">
-        delete from ss_channel_withdraw where channel_id in
+        delete from et_channel_withdraw where channel_id in
         <foreach item="channelId" collection="array" open="(" separator="," close=")">
             #{channelId}
         </foreach>