gxwebsoft/core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改settingKey的Key规则为 mp-weixin:10123

Browse Source
This commit is contained in:
赵忠林
2024-06-25 09:46:23 +08:00
parent cd7f256615
commit cf35c94f25
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/gxwebsoft/common/system/controller/SettingController.java
View File

@@ -88,8 +88,9 @@ public class SettingController extends BaseController {
@PutMapping() @PutMapping()
public ApiResult<?> update(@RequestBody Setting setting) { public ApiResult<?> update(@RequestBody Setting setting) {
if (settingService.updateById(setting)) { if (settingService.updateById(setting)) {
// 更新系统设置信息到缓存 // 更新系统设置信息到缓存 key = ""
String key = StrUtil.upperFirst(setting.getSettingKey()).concat(":").concat(getTenantId().toString()); // String key = StrUtil.upperFirst(setting.getSettingKey()).concat(":").concat(getTenantId().toString());
String key = setting.getSettingKey().concat(":").concat(setting.getTenantId().toString());
redisUtil.set(key, JSON.parseObject(setting.getContent())); redisUtil.set(key, JSON.parseObject(setting.getContent()));
// 更新租户信息 // 更新租户信息
if (setting.getSettingKey().equals("setting")) { if (setting.getSettingKey().equals("setting")) {

4
src/main/java/com/gxwebsoft/common/system/controller/WxNativePayController.java
View File

@@ -72,7 +72,7 @@ public class WxNativePayController extends BaseController {
// request.setXxx(val)设置所需参数，具体参数可见Request定义 // request.setXxx(val)设置所需参数，具体参数可见Request定义
PrepayRequest request = new PrepayRequest(); PrepayRequest request = new PrepayRequest();
// 计算金额 // 计算金额
order.setMoney(new BigDecimal(0.01)); order.setMoney(new BigDecimal(order.getPayPrice().toString()));
order.setOrderNo(CommonUtil.createOrderNo()); order.setOrderNo(CommonUtil.createOrderNo());
BigDecimal decimal = order.getMoney(); BigDecimal decimal = order.getMoney();
final BigDecimal multiply = decimal.multiply(new BigDecimal(100)); final BigDecimal multiply = decimal.multiply(new BigDecimal(100));
@@ -83,7 +83,7 @@ public class WxNativePayController extends BaseController {
request.setAmount(amount); request.setAmount(amount);
request.setAppid(appId); request.setAppid(appId);
request.setMchid(payment.getMchId()); request.setMchid(payment.getMchId());
request.setDescription("企业版-1年授权"); request.setDescription(order.getComments());
request.setNotifyUrl("https://server.gxwebsoft.com/api/system/wx-native-pay/notify/" + getTenantId()); request.setNotifyUrl("https://server.gxwebsoft.com/api/system/wx-native-pay/notify/" + getTenantId());
request.setOutTradeNo(order.getOrderNo()); request.setOutTradeNo(order.getOrderNo());
// 调用下单方法，得到应答 // 调用下单方法，得到应答