From b76aa98eeeb7cd8e52db6f881e12f45e4db4929b Mon Sep 17 00:00:00 2001 From: cgx <2606784146@qq.com> Date: Thu, 12 Dec 2024 16:30:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E6=B0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/rechargeinfo/TbRechargeInfoLogList.vue | 277 +++++++++++++++++++++ .../rechargeinfo/modules/TbRechargeInfoLogForm.vue | 188 ++++++++++++++ .../TbRechargeInfoLogModal.Style#Drawer.vue | 84 +++++++ .../modules/TbRechargeInfoLogModal.vue | 60 +++++ .../modules/hanHaiMember/entity/HanHaiMember.java | 167 +++++++------ .../controller/TbRechargeInfoLogController.java | 156 ++++++++++++ .../rechargeInfoLog/entity/TbRechargeInfoLog.java | 149 +++++++++++ .../mapper/TbRechargeInfoLogMapper.java | 14 ++ .../mapper/xml/TbRechargeInfoLogMapper.xml | 5 + .../service/ITbRechargeInfoLogService.java | 14 ++ .../service/impl/TbRechargeInfoLogServiceImpl.java | 19 ++ .../rechargeInfoLog/vue/TbRechargeInfoLogList.vue | 277 +++++++++++++++++++++ .../vue/modules/TbRechargeInfoLogForm.vue | 188 ++++++++++++++ .../TbRechargeInfoLogModal.Style#Drawer.vue | 84 +++++++ .../vue/modules/TbRechargeInfoLogModal.vue | 60 +++++ .../rechargeInfoLog/vue3/TbRechargeInfoLog.api.ts | 61 +++++ .../rechargeInfoLog/vue3/TbRechargeInfoLog.data.ts | 200 +++++++++++++++ .../rechargeInfoLog/vue3/TbRechargeInfoLogList.vue | 162 ++++++++++++ .../vue3/components/TbRechargeInfoLogModal.vue | 58 +++++ .../modules/system/controller/LoginController.java | 2 +- 20 files changed, 2144 insertions(+), 81 deletions(-) create mode 100644 admin-hanhai-vue/src/views/rechargeinfo/TbRechargeInfoLogList.vue create mode 100644 admin-hanhai-vue/src/views/rechargeinfo/modules/TbRechargeInfoLogForm.vue create mode 100644 admin-hanhai-vue/src/views/rechargeinfo/modules/TbRechargeInfoLogModal.Style#Drawer.vue create mode 100644 admin-hanhai-vue/src/views/rechargeinfo/modules/TbRechargeInfoLogModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/controller/TbRechargeInfoLogController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/entity/TbRechargeInfoLog.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/mapper/TbRechargeInfoLogMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/mapper/xml/TbRechargeInfoLogMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/service/ITbRechargeInfoLogService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/service/impl/TbRechargeInfoLogServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue/TbRechargeInfoLogList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue/modules/TbRechargeInfoLogForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue/modules/TbRechargeInfoLogModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue/modules/TbRechargeInfoLogModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue3/TbRechargeInfoLog.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue3/TbRechargeInfoLog.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue3/TbRechargeInfoLogList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue3/components/TbRechargeInfoLogModal.vue diff --git a/admin-hanhai-vue/src/views/rechargeinfo/TbRechargeInfoLogList.vue b/admin-hanhai-vue/src/views/rechargeinfo/TbRechargeInfoLogList.vue new file mode 100644 index 0000000..c9625e1 --- /dev/null +++ b/admin-hanhai-vue/src/views/rechargeinfo/TbRechargeInfoLogList.vue @@ -0,0 +1,277 @@ + + + + \ No newline at end of file diff --git a/admin-hanhai-vue/src/views/rechargeinfo/modules/TbRechargeInfoLogForm.vue b/admin-hanhai-vue/src/views/rechargeinfo/modules/TbRechargeInfoLogForm.vue new file mode 100644 index 0000000..bb2bce0 --- /dev/null +++ b/admin-hanhai-vue/src/views/rechargeinfo/modules/TbRechargeInfoLogForm.vue @@ -0,0 +1,188 @@ + + + \ No newline at end of file diff --git a/admin-hanhai-vue/src/views/rechargeinfo/modules/TbRechargeInfoLogModal.Style#Drawer.vue b/admin-hanhai-vue/src/views/rechargeinfo/modules/TbRechargeInfoLogModal.Style#Drawer.vue new file mode 100644 index 0000000..277f730 --- /dev/null +++ b/admin-hanhai-vue/src/views/rechargeinfo/modules/TbRechargeInfoLogModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/admin-hanhai-vue/src/views/rechargeinfo/modules/TbRechargeInfoLogModal.vue b/admin-hanhai-vue/src/views/rechargeinfo/modules/TbRechargeInfoLogModal.vue new file mode 100644 index 0000000..879d6d4 --- /dev/null +++ b/admin-hanhai-vue/src/views/rechargeinfo/modules/TbRechargeInfoLogModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java index 28049f2..8062ecd 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 用户表 * @Author: jeecg-boot - * @Date: 2024-07-08 + * @Date: 2024-12-12 * @Version: V1.0 */ @Data @@ -31,127 +31,133 @@ import lombok.experimental.Accessors; public class HanHaiMember implements Serializable { private static final long serialVersionUID = 1L; - /**id*/ - @TableId(type = IdType.ASSIGN_ID) + /**id*/ + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "id") private java.lang.String id; - /**创建人*/ + /**创建人*/ @ApiModelProperty(value = "创建人") private java.lang.String createBy; - /**创建日期*/ + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期") private java.util.Date createTime; - /**更新人*/ + /**更新人*/ @ApiModelProperty(value = "更新人") private java.lang.String updateBy; - /**更新日期*/ + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; - /**所属部门*/ + /**所属部门*/ @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; - /**昵称*/ - @Excel(name = "昵称", width = 15) + /**昵称*/ + @Excel(name = "昵称", width = 15) @ApiModelProperty(value = "昵称") private java.lang.String nickName; - /**用户头像*/ - @Excel(name = "用户头像", width = 15) + /**用户头像*/ + @Excel(name = "用户头像", width = 15) @ApiModelProperty(value = "用户头像") private java.lang.String headImage; - /**真实姓名*/ - @Excel(name = "真实姓名", width = 15) + /**真实姓名*/ + @Excel(name = "真实姓名", width = 15) @ApiModelProperty(value = "真实姓名") private java.lang.String name; - /**手机号码*/ - @Excel(name = "手机号码", width = 15) + /**手机号码*/ + @Excel(name = "手机号码", width = 15) @ApiModelProperty(value = "手机号码") private java.lang.String phone; - /**登录账号*/ - @Excel(name = "登录账号", width = 15) + /**登录账号*/ + @Excel(name = "登录账号", width = 15) @ApiModelProperty(value = "登录账号") private java.lang.String account; - /**登录密码*/ - @Excel(name = "登录密码", width = 15) + /**登录密码*/ + @Excel(name = "登录密码", width = 15) @ApiModelProperty(value = "登录密码") private java.lang.String password; - /**登录盐*/ - @Excel(name = "登录盐", width = 15) + /**登录盐*/ + @Excel(name = "登录盐", width = 15) @ApiModelProperty(value = "登录盐") private java.lang.String passwordSalt; - /**店铺名称备注*/ - @Excel(name = "店铺名称备注", width = 15) + /**店铺名称备注*/ + @Excel(name = "店铺名称备注", width = 15) @ApiModelProperty(value = "店铺名称备注") private java.lang.String shopName; - /**角色*/ - @Excel(name = "角色", width = 15) + /**角色*/ + @Excel(name = "角色", width = 15, dicCode = "user_role") + @Dict(dicCode = "user_role") @ApiModelProperty(value = "角色") private java.lang.String role; - /**ID标识号码*/ - @Excel(name = "ID标识号码", width = 15) + /**ID标识号码*/ + @Excel(name = "ID标识号码", width = 15) @ApiModelProperty(value = "ID标识号码") private java.lang.String cardId; - /**是否冻结*/ - @Excel(name = "是否冻结", width = 15) + /**是否冻结*/ + @Excel(name = "是否冻结", width = 15, dicCode = "is_disable") + @Dict(dicCode = "is_disable") @ApiModelProperty(value = "是否冻结") private java.lang.String frozenFlag; - /**是否删除*/ - @Excel(name = "是否删除", width = 15) + /**是否删除*/ + @Excel(name = "是否删除", width = 15) @ApiModelProperty(value = "是否删除") private java.lang.String deleteFlag; - /**登录TOEKN*/ - @Excel(name = "登录TOEKN", width = 15) + /**登录TOEKN*/ + @Excel(name = "登录TOEKN", width = 15) @ApiModelProperty(value = "登录TOEKN") private java.lang.String token; - /**公众号openid*/ - @Excel(name = "公众号openid", width = 15) + /**公众号openid*/ + @Excel(name = "公众号openid", width = 15) @ApiModelProperty(value = "公众号openid") private java.lang.String officialOpenid; - /**小程序标识*/ - @Excel(name = "小程序标识", width = 15) + /**小程序标识*/ + @Excel(name = "小程序标识", width = 15) @ApiModelProperty(value = "小程序标识") private java.lang.String appletOpenid; - /**APP标识*/ - @Excel(name = "APP标识", width = 15) + /**APP标识*/ + @Excel(name = "APP标识", width = 15) @ApiModelProperty(value = "APP标识") private java.lang.String appOpenid; - /**微信UNIONID*/ - @Excel(name = "微信UNIONID", width = 15) + /**微信UNIONID*/ + @Excel(name = "微信UNIONID", width = 15) @ApiModelProperty(value = "微信UNIONID") private java.lang.String wxUnionid; - /**公众号appid*/ - @Excel(name = "公众号appid", width = 15) + /**公众号appid*/ + @Excel(name = "公众号appid", width = 15) @ApiModelProperty(value = "公众号appid") private java.lang.String officialAppid; - /**身份证号码*/ - @Excel(name = "身份证号码", width = 15) + /**身份证号码*/ + @Excel(name = "身份证号码", width = 15) @ApiModelProperty(value = "身份证号码") private java.lang.String idCard; - /**发薪平台密码*/ - @Excel(name = "发薪平台密码", width = 15) + /**发薪平台密码*/ + @Excel(name = "发薪平台密码", width = 15) @ApiModelProperty(value = "发薪平台密码") private java.lang.String idCardPassword; - /**发薪平台加密盐*/ - @Excel(name = "发薪平台加密盐", width = 15) + /**发薪平台加密盐*/ + @Excel(name = "发薪平台加密盐", width = 15) @ApiModelProperty(value = "发薪平台加密盐") private java.lang.String idCardSalt; - /**是否实名认证*/ - @Excel(name = "是否实名认证", width = 15) + /**是否实名认证*/ + @Excel(name = "是否实名认证", width = 15) @ApiModelProperty(value = "是否实名认证") private java.lang.String idCardOpen; - /**intentionNum*/ - @Excel(name = "intentionNum", width = 15) + /**intentionNum*/ + @Excel(name = "intentionNum", width = 15) @ApiModelProperty(value = "intentionNum") private java.lang.Integer intentionNum; - /**successNum*/ - @Excel(name = "successNum", width = 15) + /**successNum*/ + @Excel(name = "successNum", width = 15) @ApiModelProperty(value = "successNum") private java.lang.Integer successNum; - /**addNum*/ - @Excel(name = "addNum", width = 15) + /**addNum*/ + @Excel(name = "addNum", width = 15) @ApiModelProperty(value = "addNum") private java.lang.Integer addNum; - /**shareId*/ - @Excel(name = "shareId", width = 15) + /**shareId*/ + @Excel(name = "shareId", width = 15) @ApiModelProperty(value = "shareId") private java.lang.String shareId; /**邀请人*/ @@ -159,42 +165,43 @@ public class HanHaiMember implements Serializable { @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") @ApiModelProperty(value = "邀请人") private java.lang.String vid; - /**邀请时间*/ - @Excel(name = "邀请时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + /**邀请时间*/ + @Excel(name = "邀请时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "邀请时间") private java.util.Date vtime; - /**兼兼街会员*/ - @Excel(name = "兼兼街会员", width = 15) + /**兼兼街会员*/ + @Excel(name = "兼兼街会员", width = 15) @ApiModelProperty(value = "兼兼街会员") private java.lang.Integer isPay; - /**是否关注公众号*/ - @Excel(name = "是否关注公众号", width = 15) + /**是否关注公众号*/ + @Excel(name = "是否关注公众号", width = 15) @ApiModelProperty(value = "是否关注公众号") private java.lang.Integer follow; - /**payRole*/ - @Excel(name = "payRole", width = 15) + /**payRole*/ + @Excel(name = "payRole", width = 15) @ApiModelProperty(value = "payRole") private java.math.BigDecimal payRole; - /**余额*/ - @Excel(name = "余额", width = 15) + /**余额*/ + @Excel(name = "余额", width = 15) @ApiModelProperty(value = "余额") private java.math.BigDecimal price; - /**积分*/ - @Excel(name = "积分", width = 15) + /**积分*/ + @Excel(name = "积分", width = 15) @ApiModelProperty(value = "积分") private java.math.BigDecimal integerPrice; - /**小程序appid*/ - @Excel(name = "小程序appid", width = 15) + /**小程序appid*/ + @Excel(name = "小程序appid", width = 15) @ApiModelProperty(value = "小程序appid") private java.lang.String appletAppid; - /**性别*/ - @Excel(name = "性别", width = 15) + /**性别*/ + @Excel(name = "性别", width = 15, dicCode = "sex") + @Dict(dicCode = "sex") @ApiModelProperty(value = "性别") private java.lang.String sex; - /**是否分销商*/ - @Excel(name = "是否分销商", width = 15) + /**是否分销商*/ + @Excel(name = "是否分销商", width = 15) @ApiModelProperty(value = "是否分销商") private java.lang.String isDai; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/controller/TbRechargeInfoLogController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/controller/TbRechargeInfoLogController.java new file mode 100644 index 0000000..fdafd39 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/controller/TbRechargeInfoLogController.java @@ -0,0 +1,156 @@ +package org.jeecg.modules.rechargeInfoLog.controller; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.rechargeInfoLog.entity.TbRechargeInfoLog; +import org.jeecg.modules.rechargeInfoLog.service.ITbRechargeInfoLogService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: tb_recharge_info_log + * @Author: jeecg-boot + * @Date: 2024-12-12 + * @Version: V1.0 + */ +@Api(tags="tb_recharge_info_log") +@RestController +@RequestMapping("/rechargeInfoLog/tbRechargeInfoLog") +@Slf4j +public class TbRechargeInfoLogController extends JeecgController { + @Autowired + private ITbRechargeInfoLogService tbRechargeInfoLogService; + + /** + * 分页列表查询 + * + * @param tbRechargeInfoLog + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "tb_recharge_info_log-分页列表查询") + @ApiOperation(value="tb_recharge_info_log-分页列表查询", notes="tb_recharge_info_log-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(TbRechargeInfoLog tbRechargeInfoLog, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(tbRechargeInfoLog, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = tbRechargeInfoLogService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param tbRechargeInfoLog + * @return + */ + @AutoLog(value = "tb_recharge_info_log-添加") + @ApiOperation(value="tb_recharge_info_log-添加", notes="tb_recharge_info_log-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody TbRechargeInfoLog tbRechargeInfoLog) { + tbRechargeInfoLogService.save(tbRechargeInfoLog); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param tbRechargeInfoLog + * @return + */ + @AutoLog(value = "tb_recharge_info_log-编辑") + @ApiOperation(value="tb_recharge_info_log-编辑", notes="tb_recharge_info_log-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody TbRechargeInfoLog tbRechargeInfoLog) { + tbRechargeInfoLogService.updateById(tbRechargeInfoLog); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "tb_recharge_info_log-通过id删除") + @ApiOperation(value="tb_recharge_info_log-通过id删除", notes="tb_recharge_info_log-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + tbRechargeInfoLogService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "tb_recharge_info_log-批量删除") + @ApiOperation(value="tb_recharge_info_log-批量删除", notes="tb_recharge_info_log-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.tbRechargeInfoLogService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "tb_recharge_info_log-通过id查询") + @ApiOperation(value="tb_recharge_info_log-通过id查询", notes="tb_recharge_info_log-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + TbRechargeInfoLog tbRechargeInfoLog = tbRechargeInfoLogService.getById(id); + if(tbRechargeInfoLog==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(tbRechargeInfoLog); + } + + /** + * 导出excel + * + * @param request + * @param tbRechargeInfoLog + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, TbRechargeInfoLog tbRechargeInfoLog) { + return super.exportXls(request, tbRechargeInfoLog, TbRechargeInfoLog.class, "tb_recharge_info_log"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, TbRechargeInfoLog.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/entity/TbRechargeInfoLog.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/entity/TbRechargeInfoLog.java new file mode 100644 index 0000000..361be98 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/entity/TbRechargeInfoLog.java @@ -0,0 +1,149 @@ +package org.jeecg.modules.rechargeInfoLog.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: tb_recharge_info_log + * @Author: jeecg-boot + * @Date: 2024-12-12 + * @Version: V1.0 + */ +@Data +@TableName("tb_recharge_info_log") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="tb_recharge_info_log对象", description="tb_recharge_info_log") +public class TbRechargeInfoLog implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**标题*/ + @Excel(name = "标题", width = 15) + @ApiModelProperty(value = "标题") + private java.lang.String title; + /**金额*/ + @Excel(name = "金额", width = 15) + @ApiModelProperty(value = "金额") + private java.math.BigDecimal money; + /**用户原本金额*/ + @Excel(name = "用户原本金额", width = 15) + @ApiModelProperty(value = "用户原本金额") + private java.math.BigDecimal userMoney; + /**是否支付 0否 1是*/ + @Excel(name = "是否支付 0否 1是", width = 15) + @ApiModelProperty(value = "是否支付 0否 1是") + private java.lang.Integer isPay; + /**备注说明*/ + @Excel(name = "备注说明", width = 15) + @ApiModelProperty(value = "备注说明") + private java.lang.String info; + /**支付时间*/ + @Excel(name = "支付时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "支付时间") + private java.util.Date payTime; + /**用户Id*/ + @Excel(name = "用户Id", width = 15) + @ApiModelProperty(value = "用户Id") + private java.lang.String memberId; + /**微信支付返回流水*/ + @Excel(name = "微信支付返回流水", width = 15) + @ApiModelProperty(value = "微信支付返回流水") + private java.lang.String wxCode; + /**微信支付返回信息*/ + @Excel(name = "微信支付返回信息", width = 15) + @ApiModelProperty(value = "微信支付返回信息") + private java.lang.String wxInfo; + /**充值挡位id*/ + @Excel(name = "充值挡位id", width = 15) + @ApiModelProperty(value = "充值挡位id") + private java.lang.String rechargeId; + /**类型 0支出 1支入*/ + @Excel(name = "类型 0支出 1支入", width = 15, dicCode = "rec_type") + @Dict(dicCode = "rec_type") + @ApiModelProperty(value = "类型 0支出 1支入") + private java.lang.Integer type; + /**订单id*/ + @Excel(name = "订单id", width = 15) + @ApiModelProperty(value = "订单id") + private java.lang.String orderId; + /**服务费*/ + @Excel(name = "服务费", width = 15) + @ApiModelProperty(value = "服务费") + private java.math.BigDecimal serviceCharge; + /**退款订单号*/ + @Excel(name = "退款订单号", width = 15) + @ApiModelProperty(value = "退款订单号") + private java.lang.String refundRechargeId; + /**提现审核 0未审核 1已审核 2已打款 3审核未通过*/ + @Excel(name = "提现审核 0未审核 1已审核 2已打款 3审核未通过", width = 15, dicCode = "rec_state") + @Dict(dicCode = "rec_state") + @ApiModelProperty(value = "提现审核 0未审核 1已审核 2已打款 3审核未通过") + private java.lang.Integer state; + /**商家批次单号*/ + @Excel(name = "商家批次单号", width = 15) + @ApiModelProperty(value = "商家批次单号") + private java.lang.String outBatchNo; + /**真实姓名*/ + @Excel(name = "真实姓名", width = 15) + @ApiModelProperty(value = "真实姓名") + private java.lang.String realName; + /**微信批次单号*/ + @Excel(name = "微信批次单号", width = 15) + @ApiModelProperty(value = "微信批次单号") + private java.lang.String batchId; + /**员工id*/ + @Excel(name = "员工id", width = 15) + @ApiModelProperty(value = "员工id") + private java.lang.String staffMemberId; + /**审核说明*/ + @Excel(name = "审核说明", width = 15) + @ApiModelProperty(value = "审核说明") + private java.lang.String checkInfo; + /**提现id*/ + @Excel(name = "提现id", width = 15) + @ApiModelProperty(value = "提现id") + private java.lang.String withdrawalId; + /**是否删除 0否 1是*/ + @Excel(name = "是否删除 0否 1是", width = 15) + @ApiModelProperty(value = "是否删除 0否 1是") + private java.lang.Integer delFlag; + /**创建时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "创建时间") + private java.util.Date createTime; + /**修改时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "修改时间") + private java.util.Date updateTime; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/mapper/TbRechargeInfoLogMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/mapper/TbRechargeInfoLogMapper.java new file mode 100644 index 0000000..5c98368 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/mapper/TbRechargeInfoLogMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.rechargeInfoLog.mapper; + +import org.jeecg.modules.rechargeInfoLog.entity.TbRechargeInfoLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: tb_recharge_info_log + * @Author: jeecg-boot + * @Date: 2024-12-12 + * @Version: V1.0 + */ +public interface TbRechargeInfoLogMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/mapper/xml/TbRechargeInfoLogMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/mapper/xml/TbRechargeInfoLogMapper.xml new file mode 100644 index 0000000..e4a25fd --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/mapper/xml/TbRechargeInfoLogMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/service/ITbRechargeInfoLogService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/service/ITbRechargeInfoLogService.java new file mode 100644 index 0000000..65ca353 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/service/ITbRechargeInfoLogService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.rechargeInfoLog.service; + +import org.jeecg.modules.rechargeInfoLog.entity.TbRechargeInfoLog; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: tb_recharge_info_log + * @Author: jeecg-boot + * @Date: 2024-12-12 + * @Version: V1.0 + */ +public interface ITbRechargeInfoLogService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/service/impl/TbRechargeInfoLogServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/service/impl/TbRechargeInfoLogServiceImpl.java new file mode 100644 index 0000000..978d87f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/service/impl/TbRechargeInfoLogServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.rechargeInfoLog.service.impl; + +import org.jeecg.modules.rechargeInfoLog.entity.TbRechargeInfoLog; +import org.jeecg.modules.rechargeInfoLog.mapper.TbRechargeInfoLogMapper; +import org.jeecg.modules.rechargeInfoLog.service.ITbRechargeInfoLogService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: tb_recharge_info_log + * @Author: jeecg-boot + * @Date: 2024-12-12 + * @Version: V1.0 + */ +@Service +public class TbRechargeInfoLogServiceImpl extends ServiceImpl implements ITbRechargeInfoLogService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue/TbRechargeInfoLogList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue/TbRechargeInfoLogList.vue new file mode 100644 index 0000000..c9625e1 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue/TbRechargeInfoLogList.vue @@ -0,0 +1,277 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue/modules/TbRechargeInfoLogForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue/modules/TbRechargeInfoLogForm.vue new file mode 100644 index 0000000..bb2bce0 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue/modules/TbRechargeInfoLogForm.vue @@ -0,0 +1,188 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue/modules/TbRechargeInfoLogModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue/modules/TbRechargeInfoLogModal.Style#Drawer.vue new file mode 100644 index 0000000..277f730 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue/modules/TbRechargeInfoLogModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue/modules/TbRechargeInfoLogModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue/modules/TbRechargeInfoLogModal.vue new file mode 100644 index 0000000..879d6d4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue/modules/TbRechargeInfoLogModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue3/TbRechargeInfoLog.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue3/TbRechargeInfoLog.api.ts new file mode 100644 index 0000000..ab18bf1 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue3/TbRechargeInfoLog.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/rechargeInfoLog/tbRechargeInfoLog/list', + save='/rechargeInfoLog/tbRechargeInfoLog/add', + edit='/rechargeInfoLog/tbRechargeInfoLog/edit', + deleteOne = '/rechargeInfoLog/tbRechargeInfoLog/delete', + deleteBatch = '/rechargeInfoLog/tbRechargeInfoLog/deleteBatch', + importExcel = '/rechargeInfoLog/tbRechargeInfoLog/importExcel', + exportXls = '/rechargeInfoLog/tbRechargeInfoLog/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue3/TbRechargeInfoLog.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue3/TbRechargeInfoLog.data.ts new file mode 100644 index 0000000..e0e84b0 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue3/TbRechargeInfoLog.data.ts @@ -0,0 +1,200 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '标题', + align:"center", + dataIndex: 'title' + }, + { + title: '金额', + align:"center", + dataIndex: 'money' + }, + { + title: '用户原本金额', + align:"center", + dataIndex: 'userMoney' + }, + { + title: '备注说明', + align:"center", + dataIndex: 'info' + }, + { + title: '支付时间', + align:"center", + dataIndex: 'payTime' + }, + { + title: '用户Id', + align:"center", + dataIndex: 'memberId' + }, + { + title: '类型 0支出 1支入', + align:"center", + dataIndex: 'type_dictText' + }, + { + title: '订单id', + align:"center", + dataIndex: 'orderId' + }, + { + title: '服务费', + align:"center", + dataIndex: 'serviceCharge' + }, + { + title: '退款订单号', + align:"center", + dataIndex: 'refundRechargeId' + }, + { + title: '提现审核 0未审核 1已审核 2已打款 3审核未通过', + align:"center", + dataIndex: 'state_dictText' + }, + { + title: '商家批次单号', + align:"center", + dataIndex: 'outBatchNo' + }, + { + title: '真实姓名', + align:"center", + dataIndex: 'realName' + }, + { + title: '微信批次单号', + align:"center", + dataIndex: 'batchId' + }, + { + title: '审核说明', + align:"center", + dataIndex: 'checkInfo' + }, + { + title: '提现id', + align:"center", + dataIndex: 'withdrawalId' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ + { + label: "用户Id", + field: "memberId", + component: 'Input', + colProps: {span: 6}, + }, +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '标题', + field: 'title', + component: 'Input', + }, + { + label: '金额', + field: 'money', + component: 'InputNumber', + dynamicRules: ({model,schema}) => { + return [ + { required: true, message: '请输入金额!'}, + ]; + }, + }, + { + label: '用户原本金额', + field: 'userMoney', + component: 'InputNumber', + dynamicRules: ({model,schema}) => { + return [ + { required: true, message: '请输入用户原本金额!'}, + ]; + }, + }, + { + label: '备注说明', + field: 'info', + component: 'Input', + }, + { + label: '支付时间', + field: 'payTime', + component: 'Input', + }, + { + label: '用户Id', + field: 'memberId', + component: 'Input', + }, + { + label: '类型 0支出 1支入', + field: 'type', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"rec_type" + }, + dynamicRules: ({model,schema}) => { + return [ + { required: true, message: '请输入类型 0支出 1支入!'}, + ]; + }, + }, + { + label: '订单id', + field: 'orderId', + component: 'Input', + }, + { + label: '服务费', + field: 'serviceCharge', + component: 'InputNumber', + }, + { + label: '退款订单号', + field: 'refundRechargeId', + component: 'Input', + }, + { + label: '提现审核 0未审核 1已审核 2已打款 3审核未通过', + field: 'state', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"rec_state" + }, + }, + { + label: '商家批次单号', + field: 'outBatchNo', + component: 'Input', + }, + { + label: '真实姓名', + field: 'realName', + component: 'Input', + }, + { + label: '微信批次单号', + field: 'batchId', + component: 'Input', + }, + { + label: '审核说明', + field: 'checkInfo', + component: 'Input', + }, + { + label: '提现id', + field: 'withdrawalId', + component: 'Input', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue3/TbRechargeInfoLogList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue3/TbRechargeInfoLogList.vue new file mode 100644 index 0000000..6e1d4c7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue3/TbRechargeInfoLogList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue3/components/TbRechargeInfoLogModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue3/components/TbRechargeInfoLogModal.vue new file mode 100644 index 0000000..19647f7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/vue3/components/TbRechargeInfoLogModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java index 502d3fc..6545c59 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java @@ -429,7 +429,7 @@ public class LoginController { String token = JwtUtil.sign(username, syspassword); // 设置token缓存有效时间 redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); - redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME * 2 / 1000); + redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME * 10 / 1000); obj.put("token", token); obj.put("userInfo", sysUser); obj.put("sysAllDictItems", sysDictService.queryAllDictItems());