From 93fed9a780bece6413b5c1b1e48aa42ca4816eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Sat, 27 Jul 2024 12:43:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=94=AF=E4=BB=98=E8=AF=81?= =?UTF-8?q?=E4=B9=A6=E4=B8=8A=E4=BC=A0bug=E3=80=81=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=E5=85=85=E5=80=BC=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/FileController.java | 15 +++---- .../controller/RechargeOrderController.java | 42 ++++++++++--------- .../common/system/entity/RechargeOrder.java | 15 +++++++ .../system/mapper/xml/RechargeOrderMapper.xml | 1 + 4 files changed, 46 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/gxwebsoft/common/system/controller/FileController.java b/src/main/java/com/gxwebsoft/common/system/controller/FileController.java index a2d59fe..5c00c1a 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/FileController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/FileController.java @@ -83,13 +83,14 @@ public class FileController extends BaseController { } result.setDownloadUrl(config.getFileServer() + "/download" + path); // 云存储配置 - final String s = redisUtil.get("setting:upload:" + getTenantId()); - final JSONObject jsonObject = JSONObject.parseObject(s); - final String uploadMethod = jsonObject.getString("uploadMethod"); - final String bucketDomain = jsonObject.getString("bucketDomain"); - if(!uploadMethod.equals("file")){ - path = bucketDomain + path; - } +// final String s = redisUtil.get("setting:upload:" + getTenantId()); +// +// final JSONObject jsonObject = JSONObject.parseObject(s); +// final String uploadMethod = jsonObject.getString("uploadMethod"); +// final String bucketDomain = jsonObject.getString("bucketDomain"); +// if(!uploadMethod.equals("file")){ +// path = bucketDomain + path; +// } result.setUrl(path); fileRecordService.save(result); return success(result); diff --git a/src/main/java/com/gxwebsoft/common/system/controller/RechargeOrderController.java b/src/main/java/com/gxwebsoft/common/system/controller/RechargeOrderController.java index 58e0410..c5aea12 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/RechargeOrderController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/RechargeOrderController.java @@ -132,27 +132,29 @@ public class RechargeOrderController extends BaseController { @PostMapping("/batchRecharge") @Transactional(rollbackFor = {Exception.class}) public ApiResult batchRecharge(@RequestBody List list) { + String nickname = getLoginUser().getNickname(); + String realName = getLoginUser().getRealName(); + ArrayList users = new ArrayList<>(list.size()); + ArrayList logs = new ArrayList<>(list.size()); + + list.forEach(d -> { + User user = userService.getByIdRel(d.getUserId()); + BigDecimal balance = user.getBalance().add(d.getPayPrice()); + user.setBalance(balance); + users.add(user); + UserBalanceLog userBalanceLog = new UserBalanceLog(); + userBalanceLog.setUserId(d.getUserId()); + userBalanceLog.setScene(BALANCE_ADMIN); + userBalanceLog.setMoney(d.getPayPrice()); + userBalanceLog.setBalance(balance); + userBalanceLog.setComments("操作员：" + realName); + userBalanceLog.setRemark(d.getComments()); + userBalanceLog.setMerchantCode(d.getMerchantCode()); + d.setOperator(realName); + logs.add(userBalanceLog); + }); + if (rechargeOrderService.saveBatch(list)) { - String nickname = getLoginUser().getNickname(); - ArrayList users = new ArrayList<>(list.size()); - ArrayList logs = new ArrayList<>(list.size()); - - list.forEach(d -> { - User user = userService.getByIdRel(d.getUserId()); - BigDecimal balance = user.getBalance().add(d.getPayPrice()); - user.setBalance(balance); - users.add(user); - UserBalanceLog userBalanceLog = new UserBalanceLog(); - userBalanceLog.setUserId(d.getUserId()); - userBalanceLog.setScene(BALANCE_ADMIN); - userBalanceLog.setMoney(d.getPayPrice()); - userBalanceLog.setBalance(balance); - userBalanceLog.setComments("操作人：" + nickname); - userBalanceLog.setRemark(d.getComments()); - userBalanceLog.setMerchantCode(d.getMerchantCode()); - logs.add(userBalanceLog); - }); - // 批量充值 userService.updateBatchById(users); // 记录余额明细 diff --git a/src/main/java/com/gxwebsoft/common/system/entity/RechargeOrder.java b/src/main/java/com/gxwebsoft/common/system/entity/RechargeOrder.java index 5388da5..e9a704c 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/RechargeOrder.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/RechargeOrder.java @@ -1,5 +1,6 @@ package com.gxwebsoft.common.system.entity; +import cn.hutool.core.util.DesensitizedUtil; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -72,6 +73,9 @@ public class RechargeOrder implements Serializable { @ApiModelProperty(value = "所属门店ID") private Integer shopId; + @ApiModelProperty(value = "操作员") + private String operator; + @ApiModelProperty(value = "排序(数字越小越靠前)") private Integer sortNumber; @@ -109,8 +113,19 @@ public class RechargeOrder implements Serializable { @TableField(exist = false) private String realName; + @ApiModelProperty(value = "手机号码") + @TableField(exist = false) + private String phone; + + @ApiModelProperty(value = "手机号码(脱敏)") + @TableField(exist = false) + private String mobile; + @ApiModelProperty(value = "部门名称") @TableField(exist = false) private String organizationName; + public String getMobile(){ + return DesensitizedUtil.mobilePhone(this.phone); + } } diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/RechargeOrderMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/RechargeOrderMapper.xml index 515d750..e1ebeec 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/RechargeOrderMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/RechargeOrderMapper.xml @@ -84,6 +84,7 @@ AND ( b.nickname LIKE CONCAT('%', #{param.keywords}, '%') + OR a.user_id LIKE CONCAT('%', #{param.keywords}, '%') OR b.alias LIKE CONCAT('%', #{param.keywords}, '%') OR b.phone LIKE CONCAT('%', #{param.keywords}, '%') OR b.real_name LIKE CONCAT('%', #{param.keywords}, '%')