From 29ee53f79d9885a29c940fee5efabc57eed3c443 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, 26 Jul 2025 14:23:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8810550=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/PaymentController.java | 13 ++---- .../system/controller/SettingController.java | 13 ++---- .../system/mapper/xml/SettingMapper.xml | 2 +- .../service/impl/ShopOrderServiceImpl.java | 40 ++++++++++--------- 4 files changed, 29 insertions(+), 39 deletions(-) diff --git a/src/main/java/com/gxwebsoft/common/system/controller/PaymentController.java b/src/main/java/com/gxwebsoft/common/system/controller/PaymentController.java index 44c27f0..750dbe6 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/PaymentController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/PaymentController.java @@ -132,31 +132,24 @@ public class PaymentController extends BaseController { @ApiOperation("分页查询支付方式") @GetMapping("/page") public ApiResult> page(PaymentParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time asc"); - return success(paymentService.page(page, page.getWrapper())); // 使用关联查询 -// return success(paymentService.pageRel(param)); + return success(paymentService.pageRel(param)); } @PreAuthorize("hasAuthority('sys:payment:list')") @ApiOperation("查询全部支付方式") @GetMapping() public ApiResult> list(PaymentParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time asc"); - return success(paymentService.list(page.getOrderWrapper())); // 使用关联查询 - //return success(paymentService.listRel(param)); + return success(paymentService.listRel(param)); } @PreAuthorize("hasAuthority('sys:payment:list')") @ApiOperation("根据id查询支付方式") @GetMapping("/{id}") public ApiResult get(@PathVariable("id") Integer id) { - return success(paymentService.getById(id)); // 使用关联查询 - //return success(paymentService.getByIdRel(id)); + return success(paymentService.getByIdRel(id)); } @PreAuthorize("hasAuthority('sys:payment:save')") 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 814a1fa..1fff178 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/SettingController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/SettingController.java @@ -40,31 +40,24 @@ public class SettingController extends BaseController { @ApiOperation("分页查询系统设置") @GetMapping("/page") public ApiResult> page(SettingParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(settingService.page(page, page.getWrapper())); // 使用关联查询 - //return success(settingService.pageRel(param)); + return success(settingService.pageRel(param)); } @PreAuthorize("hasAuthority('sys:setting:save')") @ApiOperation("查询全部系统设置") @GetMapping() public ApiResult> list(SettingParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(settingService.list(page.getOrderWrapper())); // 使用关联查询 - //return success(settingService.listRel(param)); + return success(settingService.listRel(param)); } @PreAuthorize("hasAuthority('sys:setting:save')") @ApiOperation("根据id查询系统设置") @GetMapping("/{id}") public ApiResult get(@PathVariable("id") Integer id) { - return success(settingService.getById(id)); // 使用关联查询 - //return success(settingService.getByIdRel(id)); + return success(settingService.getByIdRel(id)); } @PreAuthorize("hasAuthority('sys:setting:save')") diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/SettingMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/SettingMapper.xml index ac81f4e..f99a88f 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/SettingMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/SettingMapper.xml @@ -5,7 +5,7 @@ SELECT a.* - FROM sys_setting a + FROM gxwebsoft_core.sys_setting a AND a.setting_key = #{param.settingKey} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java index 8ce49b7..6b67a26 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java @@ -10,7 +10,9 @@ import com.gxwebsoft.common.core.exception.BusinessException; import com.gxwebsoft.common.core.utils.RedisUtil; import com.gxwebsoft.common.system.entity.Payment; + import com.gxwebsoft.common.system.param.PaymentParam; import com.gxwebsoft.common.system.service.PaymentService; + import com.gxwebsoft.common.system.service.SettingService; import com.gxwebsoft.shop.entity.ShopOrderGoods; import com.gxwebsoft.shop.mapper.ShopOrderMapper; import com.gxwebsoft.shop.service.ShopOrderGoodsService; @@ -56,6 +58,8 @@ private ShopOrderGoodsService shopOrderGoodsService; @Resource private PaymentService paymentService; + @Resource + private SettingService settingService; public static String privateKeyPath = "/Users/gxwebsoft/Downloads/ef7f7e0430cb47019d06b93f885bf95f/apiclient_key.pem"; public static String privateCertPath = "/Users/gxwebsoft/JAVA/com.gxwebsoft.core/src/main/resources/cert/apiclient_cert.pem"; @@ -99,8 +103,6 @@ public HashMap createWxOrder(ShopOrder order) { // 后台微信支付配置信息 final Payment payment = getPayment(order); - // 微信小程序信息 - final JSONObject wxConfig = getWxConfig(order); // 返回的订单数据 final HashMap orderInfo = new HashMap<>(); // 构建service @@ -116,7 +118,7 @@ amount.setTotal(money); amount.setCurrency("CNY"); request.setAmount(amount); - request.setAppid(wxConfig.getString("appId")); + request.setAppid(payment.getAppId()); request.setMchid(payment.getMchId()); request.setDescription(order.getComments()); request.setOutTradeNo(order.getOrderNo()); @@ -199,28 +201,24 @@ if (ObjectUtil.isNotEmpty(payment)) { return payment; } - return paymentService.getOne(new LambdaQueryWrapper().eq(Payment::getType, order.getType()).last("LIMIT 1")); - } - - public JSONObject getWxConfig(ShopOrder order) { - // 微信小程序(微信支付) - String key = "mp-weixin:".concat(order.getTenantId().toString()); - final String string = redisUtil.get(key); - return JSONObject.parseObject(string); + final PaymentParam paymentParam = new PaymentParam(); + paymentParam.setType(order.getPayType()); + final List payments = paymentService.listRel(paymentParam); + return payments.get(0); } public JsapiServiceExtension getWxService(ShopOrder order) { - Integer payType = order.getPayType(); +// Integer payType = order.getPayType(); final String uploadPath = config.getUploadPath(); // 服务器本地路径 - final HashMap orderInfo = new HashMap<>(); +// final HashMap orderInfo = new HashMap<>(); // 微信小程序(微信支付) - String key = "mp-weixin:".concat(order.getTenantId().toString()); - final String string = redisUtil.get(key); +// String key = "mp-weixin:".concat(order.getTenantId().toString()); +// final String string = redisUtil.get(key); // System.out.println("string = " + string); - final JSONObject mpWx = JSONObject.parseObject(string); +// final JSONObject mpWx = JSONObject.parseObject(string); // System.out.println("mpWx = " + mpWx); - String key2 = "Payment:".concat(payType.toString()).concat(":").concat(order.getTenantId().toString()); - final Payment payment = redisUtil.get(key2, Payment.class); +// String key2 = "Payment:".concat(payType.toString()).concat(":").concat(order.getTenantId().toString()); + final Payment payment = getPayment(order); if (ObjectUtil.isEmpty(payment)) { throw new BusinessException("请完成支付配置"); } @@ -228,12 +226,18 @@ String privateKey = uploadPath.concat("/file").concat(payment.getApiclientKey()); // 秘钥证书 String apiclientCert = uploadPath.concat("/file").concat(payment.getApiclientCert()); String pubKey = uploadPath.concat("/file").concat(payment.getPubKey()); // 公钥证书 + // 开发环境配置 if (active.equals("dev")) { privateKey = privateKeyPath; apiclientCert = wechatpayCertPath; } + // 生成环境配置 + if (active.equals("prod")) { + + } + // 兼容公钥 Config config; if (payment.getPubKey() != null && !payment.getPubKey().isEmpty()) {