基础平台-商户信息-结算账户

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java

@@ -137,6 +137,6 @@ public interface UserConstants {
     /**
      * 超级管理员ID
      */
-    Long SUPER_ADMIN_ID = 1L;
+    Long SUPER_ADMIN_ID = 100L;
 
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/RuoYiBackstageApplication.java

@@ -17,6 +17,6 @@ public class RuoYiBackstageApplication {
         SpringApplication application = new SpringApplication(RuoYiBackstageApplication.class);
         application.setApplicationStartup(new BufferingApplicationStartup(2048));
         application.run(args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  一卡通模块启动成功   ლ(´ڡ`ლ)ﾞ  ");
+        System.out.println("(♥◠‿◠)ﾉﾞ  一卡通-基础平台模块启动成功   ლ(´ڡ`ლ)ﾞ  ");
     }
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/controller/PtAccountController.java

@@ -0,0 +1,106 @@
+package org.dromara.backstage.basics.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.backstage.basics.domain.vo.PtAccountVo;
+import org.dromara.backstage.basics.domain.bo.PtAccountBo;
+import org.dromara.backstage.basics.service.IPtAccountService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 结算账户
+ * 前端访问路由地址为:/backstage/merchant/ptAccount
+ *
+ * @author bing
+ * @date 2024-07-31
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/merchant/ptAccount")
+public class PtAccountController extends BaseController {
+
+    private final IPtAccountService ptAccountService;
+
+    /**
+     * 查询结算账户列表
+     */
+    @SaCheckPermission("merchant:ptAccount:list")
+    @GetMapping("/list")
+    public TableDataInfo<PtAccountVo> list(PtAccountBo bo, PageQuery pageQuery) {
+        return ptAccountService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出结算账户列表
+     */
+    @SaCheckPermission("merchant:ptAccount:export")
+    @Log(title = "结算账户", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(PtAccountBo bo, HttpServletResponse response) {
+        List<PtAccountVo> list = ptAccountService.queryList(bo);
+        ExcelUtil.exportExcel(list, "结算账户", PtAccountVo.class, response);
+    }
+
+    /**
+     * 获取结算账户详细信息
+     *
+     * @param accountId 主键
+     */
+    @SaCheckPermission("merchant:ptAccount:query")
+    @GetMapping("/{accountId}")
+    public R<PtAccountVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long accountId) {
+        return R.ok(ptAccountService.queryById(accountId));
+    }
+
+    /**
+     * 新增结算账户
+     */
+    @SaCheckPermission("merchant:ptAccount:add")
+    @Log(title = "结算账户", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody PtAccountBo bo) {
+        return toAjax(ptAccountService.insertByBo(bo));
+    }
+
+    /**
+     * 修改结算账户
+     */
+    @SaCheckPermission("merchant:ptAccount:edit")
+    @Log(title = "结算账户", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody PtAccountBo bo) {
+        return toAjax(ptAccountService.updateByBo(bo));
+    }
+
+    /**
+     * 删除结算账户
+     *
+     * @param accountIds 主键串
+     */
+    @SaCheckPermission("merchant:ptAccount:remove")
+    @Log(title = "结算账户", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{accountIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] accountIds) {
+        return toAjax(ptAccountService.deleteWithValidByIds(List.of(accountIds), true));
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/domain/PtAccount.java

@@ -0,0 +1,82 @@
+package org.dromara.backstage.basics.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 结算账户对象 t_pt_account
+ *
+ * @author bing
+ * @date 2024-07-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_pt_account")
+public class PtAccount extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 结算账户Id,主键
+     */
+    @TableId(value = "account_id")
+    private Long accountId;
+
+    /**
+     * 结算账户名称
+     */
+    private String accountName;
+
+    /**
+     * 结算账户代码
+     */
+    private String accountCode;
+
+    /**
+     * 账户查询密码
+     */
+    private String queryPwd;
+
+    /**
+     * 联系电话
+     */
+    private String telephone;
+
+    /**
+     * 银行卡号
+     */
+    private String bankNumber;
+
+    /**
+     * 账户状态,见sys_normal_disable字典类别
+     */
+    private String status;
+
+    /**
+     * 管理员姓名
+     */
+    private String adminName;
+
+    /**
+     * 证件编号
+     */
+    private String idNumber;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志(0-未删除 2-已删除)
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/domain/bo/PtAccountBo.java

@@ -0,0 +1,83 @@
+package org.dromara.backstage.basics.domain.bo;
+
+import org.dromara.backstage.basics.domain.PtAccount;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 结算账户业务对象 t_pt_account
+ *
+ * @author bing
+ * @date 2024-07-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = PtAccount.class, reverseConvertGenerate = false)
+public class PtAccountBo extends BaseEntity {
+
+    /**
+     * 结算账户Id,主键
+     */
+    @NotNull(message = "结算账户Id,主键不能为空", groups = { EditGroup.class })
+    private Long accountId;
+
+    /**
+     * 结算账户名称
+     */
+    @NotBlank(message = "结算账户名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String accountName;
+
+    /**
+     * 结算账户代码
+     */
+    @NotBlank(message = "结算账户代码不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String accountCode;
+
+    /**
+     * 账户查询密码
+     */
+    @NotBlank(message = "账户查询密码不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String queryPwd;
+
+    /**
+     * 联系电话
+     */
+    @NotBlank(message = "联系电话不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String telephone;
+
+    /**
+     * 银行卡号
+     */
+    @NotBlank(message = "银行卡号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String bankNumber;
+
+    /**
+     * 账户状态,见sys_normal_disable字典类别
+     */
+    @NotBlank(message = "账户状态,见sys_normal_disable字典类别不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String status;
+
+    /**
+     * 管理员姓名
+     */
+    @NotBlank(message = "管理员姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String adminName;
+
+    /**
+     * 证件编号
+     */
+    @NotBlank(message = "证件编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String idNumber;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/domain/vo/PtAccountVo.java

@@ -0,0 +1,89 @@
+package org.dromara.backstage.basics.domain.vo;
+
+import org.dromara.backstage.basics.domain.PtAccount;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 结算账户视图对象 t_pt_account
+ *
+ * @author bing
+ * @date 2024-07-31
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = PtAccount.class)
+public class PtAccountVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private Long accountId;
+
+    /**
+     * 结算账户名称
+     */
+    @ExcelProperty(value = "结算账户名称")
+    private String accountName;
+
+    /**
+     * 结算账户代码
+     */
+    @ExcelProperty(value = "结算账户代码")
+    private String accountCode;
+
+    /**
+     * 联系电话
+     */
+    @ExcelProperty(value = "联系电话")
+    private String telephone;
+
+    /**
+     * 银行卡号
+     */
+    @ExcelProperty(value = "银行卡号")
+    private String bankNumber;
+
+    /**
+     * 账户状态,见sys_normal_disable字典类别
+     */
+    @ExcelProperty(value = "账户状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_normal_disable")
+    private String status;
+
+    /**
+     * 管理员姓名
+     */
+    @ExcelProperty(value = "管理员姓名")
+    private String adminName;
+
+    /**
+     * 证件编号
+     */
+    @ExcelProperty(value = "证件编号")
+    private String idNumber;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/mapper/PtAccountMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.backstage.basics.mapper;
+
+import org.dromara.backstage.basics.domain.PtAccount;
+import org.dromara.backstage.basics.domain.vo.PtAccountVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 结算账户Mapper接口
+ *
+ * @author bing
+ * @date 2024-07-31
+ */
+public interface PtAccountMapper extends BaseMapperPlus<PtAccount, PtAccountVo> {
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/IPtAccountService.java

@@ -0,0 +1,69 @@
+package org.dromara.backstage.basics.service;
+
+import org.dromara.backstage.basics.domain.PtAccount;
+import org.dromara.backstage.basics.domain.vo.PtAccountVo;
+import org.dromara.backstage.basics.domain.bo.PtAccountBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 结算账户Service接口
+ *
+ * @author bing
+ * @date 2024-07-31
+ */
+public interface IPtAccountService {
+
+    /**
+     * 查询结算账户
+     *
+     * @param accountId 主键
+     * @return 结算账户
+     */
+    PtAccountVo queryById(Long accountId);
+
+    /**
+     * 分页查询结算账户列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 结算账户分页列表
+     */
+    TableDataInfo<PtAccountVo> queryPageList(PtAccountBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的结算账户列表
+     *
+     * @param bo 查询条件
+     * @return 结算账户列表
+     */
+    List<PtAccountVo> queryList(PtAccountBo bo);
+
+    /**
+     * 新增结算账户
+     *
+     * @param bo 结算账户
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(PtAccountBo bo);
+
+    /**
+     * 修改结算账户
+     *
+     * @param bo 结算账户
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(PtAccountBo bo);
+
+    /**
+     * 校验并批量删除结算账户信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/impl/PtAccountServiceImpl.java

@@ -0,0 +1,135 @@
+package org.dromara.backstage.basics.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.backstage.basics.domain.bo.PtAccountBo;
+import org.dromara.backstage.basics.domain.vo.PtAccountVo;
+import org.dromara.backstage.basics.domain.PtAccount;
+import org.dromara.backstage.basics.mapper.PtAccountMapper;
+import org.dromara.backstage.basics.service.IPtAccountService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 结算账户Service业务层处理
+ *
+ * @author bing
+ * @date 2024-07-31
+ */
+@RequiredArgsConstructor
+@Service
+public class PtAccountServiceImpl implements IPtAccountService {
+
+    private final PtAccountMapper baseMapper;
+
+    /**
+     * 查询结算账户
+     *
+     * @param accountId 主键
+     * @return 结算账户
+     */
+    @Override
+    public PtAccountVo queryById(Long accountId){
+        return baseMapper.selectVoById(accountId);
+    }
+
+    /**
+     * 分页查询结算账户列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 结算账户分页列表
+     */
+    @Override
+    public TableDataInfo<PtAccountVo> queryPageList(PtAccountBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<PtAccount> lqw = buildQueryWrapper(bo);
+        Page<PtAccountVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的结算账户列表
+     *
+     * @param bo 查询条件
+     * @return 结算账户列表
+     */
+    @Override
+    public List<PtAccountVo> queryList(PtAccountBo bo) {
+        LambdaQueryWrapper<PtAccount> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<PtAccount> buildQueryWrapper(PtAccountBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<PtAccount> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getAccountName()), PtAccount::getAccountName, bo.getAccountName());
+        lqw.eq(StringUtils.isNotBlank(bo.getAccountCode()), PtAccount::getAccountCode, bo.getAccountCode());
+        lqw.like(StringUtils.isNotBlank(bo.getTelephone()), PtAccount::getTelephone, bo.getTelephone());
+        lqw.like(StringUtils.isNotBlank(bo.getBankNumber()), PtAccount::getBankNumber, bo.getBankNumber());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), PtAccount::getStatus, bo.getStatus());
+        lqw.like(StringUtils.isNotBlank(bo.getAdminName()), PtAccount::getAdminName, bo.getAdminName());
+        lqw.eq(StringUtils.isNotBlank(bo.getIdNumber()), PtAccount::getIdNumber, bo.getIdNumber());
+        return lqw;
+    }
+
+    /**
+     * 新增结算账户
+     *
+     * @param bo 结算账户
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(PtAccountBo bo) {
+        PtAccount add = MapstructUtils.convert(bo, PtAccount.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setAccountId(add.getAccountId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改结算账户
+     *
+     * @param bo 结算账户
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(PtAccountBo bo) {
+        PtAccount update = MapstructUtils.convert(bo, PtAccount.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(PtAccount entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除结算账户信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9202
+  port: 9206
 
 # Spring
 spring:

ruoyi-modules/ruoyi-backstage/src/main/resources/banner.txt

@@ -1,10 +1,14 @@
 Spring Boot Version: ${spring-boot.version}
 Spring Application Name: ${spring.application.name}
-                            _                           _                    
-                           (_)                         | |                   
- _ __  _   _   ___   _   _  _  ______  ___  _   _  ___ | |_   ___  _ __ ___  
-| '__|| | | | / _ \ | | | || ||______|/ __|| | | |/ __|| __| / _ \| '_ ` _ \ 
-| |   | |_| || (_) || |_| || |        \__ \| |_| |\__ \| |_ |  __/| | | | | |
-|_|    \__,_| \___/  \__, ||_|        |___/ \__, ||___/ \__| \___||_| |_| |_|
-                      __/ |                  __/ |                           
-                     |___/                  |___/                            
+
+                        _        _                _        _
+                       (_)      | |              | |      | |
+ _ __ _   _  ___  _   _ _ ______| |__   __ _  ___| | _____| |_ __ _  __ _  ___
+| '__| | | |/ _ \| | | | |______| '_ \ / _` |/ __| |/ / __| __/ _` |/ _` |/ _ \
+| |  | |_| | (_) | |_| | |      | |_) | (_| | (__|   <\__ \ || (_| | (_| |  __/
+|_|   \__,_|\___/ \__, |_|      |_.__/ \__,_|\___|_|\_\___/\__\__,_|\__, |\___|
+                   __/ |                                             __/ |
+                  |___/                                             |___/
+
+
+

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/merchant/PtAccountMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.backstage.basics.mapper.PtAccountMapper">
+
+</mapper>