lywsvip/likeadmin_java
1
0
Fork 0
mirror of https://gitee.com/likeadmin/likeadmin_java.git synced 2026-05-22 22:49:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改登录

Browse Source 
用户列表
全局配置
用户修改
同步用户表结构
This commit is contained in:
pan.wl.2
2024-10-11 22:57:07 +08:00
parent bc59451e21
commit a2bcee032c
26 changed files with 132 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/like-common/src/main/java/com/mdd/common/config/wechat/WxPayConfiguration.java
View File

@@ -42,7 +42,7 @@ public class WxPayConfiguration {
public WxPayService mnpPayService() {
DevPayConfig config = devPayConfigMapper.selectOne(
new QueryWrapper<DevPayConfig>()
.eq("way", PaymentEnum.WX_PAY.getCode())
.eq("pay_way", PaymentEnum.WX_PAY.getCode())
.last("limit 1"));
Config systemConfig = systemConfigMapper.selectOne(new QueryWrapper<Config>()
@@ -50,7 +50,7 @@ public class WxPayConfiguration {
.eq("name", "appId")
.last("limit 1"));
String paramJson = StringUtils.isNull(config.getParams()) ? "{}" : config.getParams().toString();
String paramJson = StringUtils.isNull(config.getConfig()) ? "{}" : config.getConfig().toString();
Map<String, String> params = MapUtils.jsonToMap(paramJson);
String appId = StringUtils.isNull(systemConfig) ? "" : systemConfig.getValue();
String mchId = params.getOrDefault("mch_id", "");
@@ -81,7 +81,7 @@ public class WxPayConfiguration {
public WxPayService wxOaService() {
DevPayConfig config = devPayConfigMapper.selectOne(
new QueryWrapper<DevPayConfig>()
.eq("way", PaymentEnum.WX_PAY.getCode())
.eq("pay_way", PaymentEnum.WX_PAY.getCode())
.last("limit 1"));
Config systemConfig = systemConfigMapper.selectOne(new QueryWrapper<Config>()
@@ -89,7 +89,7 @@ public class WxPayConfiguration {
.eq("type", "oa_channel")
.last("limit 1"));
String paramJson = StringUtils.isNull(config.getParams()) ? "{}" : config.getParams().toString();
String paramJson = StringUtils.isNull(config.getConfig()) ? "{}" : config.getConfig().toString();
Map<String, String> params = MapUtils.jsonToMap(paramJson);
String appId = StringUtils.isNull(systemConfig) ? "" : systemConfig.getValue();
String mchId = params.getOrDefault("mch_id", "");

4
server/like-common/src/main/java/com/mdd/common/entity/setting/DevPayConfig.java
View File

@@ -30,7 +30,7 @@ public class DevPayConfig implements Serializable {
private String icon;
@ApiModelProperty("支付方式: [1=余额支付, 2=微信支付, 3=支付宝支付]")
private Integer way;
private Integer payWay;
@ApiModelProperty("排序编号")
private Integer sort;
@@ -39,6 +39,6 @@ public class DevPayConfig implements Serializable {
private String remark;
@ApiModelProperty("配置参数")
private Object params;
private Object config;
}

20
server/like-common/src/main/java/com/mdd/common/entity/user/User.java
View File

@@ -32,7 +32,7 @@ public class User implements Serializable {
private String nickname;
@ApiModelProperty("用户账号")
private String username;
private String account;
@ApiModelProperty("用户密码")
private String password;
@@ -41,13 +41,16 @@ public class User implements Serializable {
private String mobile;
@ApiModelProperty("用户钱包")
private BigDecimal money;
private BigDecimal userMoney;
@ApiModelProperty("累计充值")
private BigDecimal totalRechargeAmount;
@ApiModelProperty("注册渠道")
private Integer channel;
@ApiModelProperty("加密盐巴")
private String salt;
// @ApiModelProperty("加密盐巴")
// private String salt;
@ApiModelProperty("用户性别: [1=男, 2=女]")
private Integer sex;
@@ -55,14 +58,11 @@ public class User implements Serializable {
@ApiModelProperty("是否禁用: [0=否, 1=是]")
private Integer isDisable;
@ApiModelProperty("是否删除: [0=否, 1=是]")
private Integer isDelete;
@ApiModelProperty("最后登录IP")
private String lastLoginIp;
private String loginIp;
@ApiModelProperty("最后登录时间")
private Long lastLoginTime;
private Long loginTime;
@ApiModelProperty("创建时间")
private Long createTime;
@@ -74,6 +74,6 @@ public class User implements Serializable {
private Long deleteTime;
@ApiModelProperty("是否为新用户: [0=否, 1=是]")
private Integer isNew;
private Integer isNewUser;
}

4
server/like-common/src/main/java/com/mdd/common/mapper/log/LogMoneyMapper.java
View File

@@ -40,7 +40,7 @@ public interface LogMoneyMapper extends IBaseMapper<LogMoney> {
break;
}
BigDecimal leftAmount = user.getMoney().add(changeAmount);
BigDecimal leftAmount = user.getUserMoney().add(changeAmount);
LogMoney logMoney = new LogMoney();
logMoney.setSn(this.randMakeOrderSn());
@@ -80,7 +80,7 @@ public interface LogMoneyMapper extends IBaseMapper<LogMoney> {
break;
}
BigDecimal leftAmount = user.getMoney().subtract(changeAmount);
BigDecimal leftAmount = user.getUserMoney().subtract(changeAmount);
LogMoney logMoney = new LogMoney();
logMoney.setSn(this.randMakeOrderSn());

4
server/like-common/src/main/java/com/mdd/common/plugin/wechat/WxPayDriver.java
View File

@@ -158,13 +158,13 @@ public class WxPayDriver {
private static void resetConfig(String type) {
DevPayConfig config = devPayConfigMapper.selectOne(
new QueryWrapper<DevPayConfig>()
.eq("way", 2)
.eq("pay_way", 2)
.last("limit 1"));
String scene = type.equals("oa") ? "oa_channel" : "mp_channel";
String appId = ConfigUtils.get(scene, "appId", "");
Map<String, String> params = MapUtils.jsonToMap(config.getParams().toString());
Map<String, String> params = MapUtils.jsonToMap(config.getConfig().toString());
String mchId = params.get("mch_id");
String paySignKey = params.get("pay_sign_key");
byte[] privateCert = params.getOrDefault("private_cert", "").getBytes();