diff --git a/src/main/java/com/gxwebsoft/common/system/controller/SettingController.java b/src/main/java/com/gxwebsoft/common/system/controller/SettingController.java index 209c7b3..05408a1 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/SettingController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/SettingController.java @@ -88,8 +88,9 @@ public class SettingController extends BaseController { @PutMapping() public ApiResult update(@RequestBody Setting setting) { if (settingService.updateById(setting)) { - // 更新系统设置信息到缓存 - String key = StrUtil.upperFirst(setting.getSettingKey()).concat(":").concat(getTenantId().toString()); + // 更新系统设置信息到缓存 key = "" +// 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())); // 更新租户信息 if (setting.getSettingKey().equals("setting")) { diff --git a/src/main/java/com/gxwebsoft/common/system/controller/WxNativePayController.java b/src/main/java/com/gxwebsoft/common/system/controller/WxNativePayController.java index 3072b4d..f616fc5 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/WxNativePayController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/WxNativePayController.java @@ -72,7 +72,7 @@ public class WxNativePayController extends BaseController { // request.setXxx(val)设置所需参数,具体参数可见Request定义 PrepayRequest request = new PrepayRequest(); // 计算金额 - order.setMoney(new BigDecimal(0.01)); + order.setMoney(new BigDecimal(order.getPayPrice().toString())); order.setOrderNo(CommonUtil.createOrderNo()); BigDecimal decimal = order.getMoney(); final BigDecimal multiply = decimal.multiply(new BigDecimal(100)); @@ -83,7 +83,7 @@ public class WxNativePayController extends BaseController { request.setAmount(amount); request.setAppid(appId); 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.setOutTradeNo(order.getOrderNo()); // 调用下单方法,得到应答