From feee0f8534748bd370d5884d70d6aa7853c68fc0 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 14 Jan 2026 19:18:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4<=3F>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/AuthorizationController.java | 37 ++----------------- .../java/com/czg/config/FastJson2Config.java | 3 +- .../main/java/com/czg/pay/CzgPayBaseReq.java | 28 +++++++------- .../src/main/java/com/czg/PayManager.java | 4 +- .../czg/third/alipay/AlipayIsvPayManager.java | 6 +-- .../czg/third/wechat/WechatPayManager.java | 8 ++-- .../src/main/java/com/czg/PolyPayUtils.java | 10 ++--- .../czg/service/order/service/PayService.java | 2 +- .../order/service/impl/PayServiceImpl.java | 8 ++-- .../src/main/java/com/czg/PayAdapter.java | 2 +- .../java/com/czg/impl/NativePayAdapter.java | 23 +++++------- .../java/com/czg/impl/PolyPayAdapter.java | 16 ++++---- 12 files changed, 56 insertions(+), 91 deletions(-) diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java index ce2784489..ae6277e34 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java @@ -1,28 +1,18 @@ package com.czg.controller.admin; -import cn.hutool.http.server.HttpServerRequest; -import cn.hutool.http.server.HttpServerResponse; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.czg.account.dto.SysLoginDTO; import com.czg.account.entity.ShopInfo; import com.czg.account.entity.SysUser; -import com.czg.account.service.*; +import com.czg.account.service.AuthorizationService; +import com.czg.account.service.ShopInfoService; +import com.czg.account.service.SysUserService; import com.czg.account.vo.LoginVO; -import com.czg.annotation.SaAdminCheckPermission; -import com.czg.annotation.SaStaffCheckPermission; -import com.czg.config.RabbitPublisher; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.io.IOException; -import java.util.HashMap; import java.util.Map; /** @@ -76,27 +66,6 @@ public class AuthorizationController { return CzgResult.success(StpKit.USER.getPermissionList()); } - @Resource - RabbitPublisher rabbitPublisher; - @Resource - ShopTableService shopTableService; - - @GetMapping("test") - public CzgResult login(HttpServletRequest request, HttpServletResponse response) throws IOException { -// shopTableService.createQrCode(1L, 1, response, request); - - -// rabbitPublisher.sendOrderPrintMsg("552"); -// printMqListener.orderPrint("1"); -// return CzgResult.success(Map.of("token", StpKit.USER.getShopId())); - return CzgResult.success(StpKit.USER.getLoginId()); - } - - @GetMapping("test1") - public CzgResult login1() throws IOException { - authorizationService.switchTo(86L); - return CzgResult.success(StpKit.USER.getLoginId()); - } /** * 核销获取 信息使用 diff --git a/cash-common/cash-common-api-config/src/main/java/com/czg/config/FastJson2Config.java b/cash-common/cash-common-api-config/src/main/java/com/czg/config/FastJson2Config.java index a4c28e015..f4fe62181 100644 --- a/cash-common/cash-common-api-config/src/main/java/com/czg/config/FastJson2Config.java +++ b/cash-common/cash-common-api-config/src/main/java/com/czg/config/FastJson2Config.java @@ -50,9 +50,8 @@ public class FastJson2Config implements WebMvcConfigurer { // 设置支持的媒体类型 List supportedMediaTypes = new ArrayList<>(); supportedMediaTypes.add(MediaType.APPLICATION_JSON); - supportedMediaTypes.add(MediaType.APPLICATION_JSON_UTF8); converter.setSupportedMediaTypes(supportedMediaTypes); // 将转换器添加到 Spring MVC 的消息转换器列表中 - converters.add(0, converter); + converters.addFirst(converter); } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/pay/CzgPayBaseReq.java b/cash-common/cash-common-service/src/main/java/com/czg/pay/CzgPayBaseReq.java index 678ba068e..e5f5d0475 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/pay/CzgPayBaseReq.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/pay/CzgPayBaseReq.java @@ -7,7 +7,7 @@ import lombok.NonNull; * @author ww */ @Data -public class CzgPayBaseReq { +public class CzgPayBaseReq { //必填范围 /** * 订单标题 @@ -84,9 +84,9 @@ public class CzgPayBaseReq { private String subAppid; /** - * 额外参数 + * 支付条码 */ - private T data; + private String authCode; public CzgPayBaseReq() { @@ -107,27 +107,27 @@ public class CzgPayBaseReq { this.notifyUrl = notifyUrl; } - public static CzgPayBaseReq ltPayReq(@NonNull String mchOrderNo, @NonNull String detail, @NonNull Long amount + public static CzgPayBaseReq ltPayReq(@NonNull String mchOrderNo, @NonNull String detail, @NonNull Long amount , @NonNull String payType, @NonNull String openId, @NonNull String clientIp) { - return new CzgPayBaseReq<>(mchOrderNo, detail, amount, payType, openId, clientIp); + return new CzgPayBaseReq(mchOrderNo, detail, amount, payType, openId, clientIp); } - public static CzgPayBaseReq h5PayReq(@NonNull String mchOrderNo, @NonNull String detail, @NonNull Long amount, @NonNull String clientIp) { - return new CzgPayBaseReq<>(mchOrderNo, detail, amount, null, null, clientIp); + public static CzgPayBaseReq h5PayReq(@NonNull String mchOrderNo, @NonNull String detail, @NonNull Long amount, @NonNull String clientIp) { + return new CzgPayBaseReq(mchOrderNo, detail, amount, null, null, clientIp); } - public static CzgPayBaseReq jsPayReq(@NonNull String mchOrderNo, @NonNull String detail, @NonNull Long amount + public static CzgPayBaseReq jsPayReq(@NonNull String mchOrderNo, @NonNull String detail, @NonNull Long amount , @NonNull String payType, @NonNull String openId, @NonNull String clientIp) { - return new CzgPayBaseReq<>(mchOrderNo, detail, amount, payType, openId, clientIp); + return new CzgPayBaseReq(mchOrderNo, detail, amount, payType, openId, clientIp); } - public static CzgPayBaseReq scanPayReq(@NonNull String mchOrderNo, @NonNull String detail, @NonNull Long amount, @NonNull String clientIp) { - return new CzgPayBaseReq<>(mchOrderNo, detail, amount, null, null, clientIp); + public static CzgPayBaseReq scanPayReq(@NonNull String mchOrderNo, @NonNull String detail, @NonNull Long amount, @NonNull String clientIp) { + return new CzgPayBaseReq(mchOrderNo, detail, amount, null, null, clientIp); } - public static CzgPayBaseReq microPay(@NonNull String mchOrderNo, @NonNull String detail, @NonNull Long amount, @NonNull String authCode) { - CzgPayBaseReq stringReq = new CzgPayBaseReq<>(mchOrderNo, detail, amount, null, null, null); - stringReq.setData(authCode); + public static CzgPayBaseReq microPay(@NonNull String mchOrderNo, @NonNull String detail, @NonNull Long amount, @NonNull String authCode) { + CzgPayBaseReq stringReq = new CzgPayBaseReq(mchOrderNo, detail, amount, null, null, null); + stringReq.setAuthCode(authCode); return stringReq; } } diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/PayManager.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/PayManager.java index d6df65b75..cfbeaa547 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/PayManager.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/PayManager.java @@ -22,7 +22,7 @@ public class PayManager { * @param paramsDto 参数 * @return 结果 */ - public static Map jsapiPay(CzgPayBaseReq paramsDto, NativeMerchantDTO merchantDTO) { + public static Map jsapiPay(CzgPayBaseReq paramsDto, NativeMerchantDTO merchantDTO) { if (SystemConstants.PayType.WECHAT.equals(paramsDto.getPayType())) { return WechatPayManager.jsapiPay(null, paramsDto, merchantDTO); } else if (SystemConstants.PayType.ALIPAY.equals(paramsDto.getPayType())) { @@ -38,7 +38,7 @@ public class PayManager { * @param paramsDto 参数 * @return 结果 */ - public static Map barPay(CzgPayBaseReq paramsDto, NativeMerchantDTO merchantDTO) { + public static Map barPay(CzgPayBaseReq paramsDto, NativeMerchantDTO merchantDTO) { if (SystemConstants.PayType.WECHAT.equals(paramsDto.getPayType())) { return WechatPayManager.barPay(null, paramsDto, merchantDTO); } else if (SystemConstants.PayType.ALIPAY.equals(paramsDto.getPayType())) { diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayIsvPayManager.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayIsvPayManager.java index bb974549f..8b489c2ff 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayIsvPayManager.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayIsvPayManager.java @@ -33,7 +33,7 @@ public class AlipayIsvPayManager { * @param configDto 配置 * @param paramsDto 参数 */ - public static Map jsapiPay(AlipayConfigDto configDto, CzgPayBaseReq paramsDto, NativeMerchantDTO merchantDTO) { + public static Map jsapiPay(AlipayConfigDto configDto, CzgPayBaseReq paramsDto, NativeMerchantDTO merchantDTO) { try { AlipayClient.setApiClient(configDto); AlipayTradeApi api = new AlipayTradeApi(); @@ -71,7 +71,7 @@ public class AlipayIsvPayManager { * @param configDto 配置 * @param paramsDto 参数 */ - public static Map barPay(AlipayConfigDto configDto, CzgPayBaseReq paramsDto, NativeMerchantDTO merchantDTO) { + public static Map barPay(AlipayConfigDto configDto, CzgPayBaseReq paramsDto, NativeMerchantDTO merchantDTO) { try { AlipayClient.setApiClient(configDto); @@ -88,7 +88,7 @@ public class AlipayIsvPayManager { data.setScene("bar_code"); // 设置产品码 data.setProductCode("FACE_TO_FACE_PAYMENT"); - data.setAuthCode(paramsDto.getData()); + data.setAuthCode(paramsDto.getAuthCode()); // AlipayTradeCreateResponseModel responseModel = api.create(data); return new JSONObject(); diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/WechatPayManager.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/WechatPayManager.java index 902b10190..4b906fa80 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/WechatPayManager.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/WechatPayManager.java @@ -46,7 +46,7 @@ public class WechatPayManager { * @param configDto 配置 * @param paramsDto 参数 */ - public static Map jsapiPay(WechatPayConfigDto configDto, CzgPayBaseReq paramsDto, NativeMerchantDTO merchantDTO) { + public static Map jsapiPay(WechatPayConfigDto configDto, CzgPayBaseReq paramsDto, NativeMerchantDTO merchantDTO) { if (configDto == null) { configDto = WechatPayConfigDto.getDefaultConfig(); } @@ -106,7 +106,7 @@ public class WechatPayManager { * @param configDto 配置 * @param paramsDto 参数 */ - public static Map barPay(WechatPayConfigDto configDto, CzgPayBaseReq paramsDto, NativeMerchantDTO merchantDTO) { + public static Map barPay(WechatPayConfigDto configDto, CzgPayBaseReq paramsDto, NativeMerchantDTO merchantDTO) { try { if (configDto == null) { configDto = WechatPayConfigDto.getDefaultConfig(); @@ -136,8 +136,8 @@ public class WechatPayManager { payMap.put("total_fee", paramsDto.getAmount()); addElementIfNotEmpty(xml, "spbill_create_ip", paramsDto.getClientIp()); payMap.put("spbill_create_ip", paramsDto.getClientIp()); - addElementIfNotEmpty(xml, "auth_code", paramsDto.getData()); - payMap.put("auth_code", paramsDto.getData()); + addElementIfNotEmpty(xml, "auth_code", paramsDto.getAuthCode()); + payMap.put("auth_code", paramsDto.getAuthCode()); if (StrUtil.isNotBlank(paramsDto.getExtParam())) { addElementIfNotEmpty(xml, "attach", paramsDto.getExtParam()); diff --git a/cash-sdk/poly-pay/src/main/java/com/czg/PolyPayUtils.java b/cash-sdk/poly-pay/src/main/java/com/czg/PolyPayUtils.java index 4e3bb74ad..e6ec47fea 100644 --- a/cash-sdk/poly-pay/src/main/java/com/czg/PolyPayUtils.java +++ b/cash-sdk/poly-pay/src/main/java/com/czg/PolyPayUtils.java @@ -40,7 +40,7 @@ public class PolyPayUtils { * @param appSecret 应用密钥 tb_shop_merchant 表中的 app_secret * CzgResult */ - public static CzgResult> h5Pay(@NonNull String domain, @NonNull String appId, @NonNull String appSecret, CzgPayBaseReq bizData) { + public static CzgResult> h5Pay(@NonNull String domain, @NonNull String appId, @NonNull String appSecret, CzgPayBaseReq bizData) { return execPayResult(sendPolyPay(domain.concat(CzgPayEnum.H5_PAY.getUri()), PolyBaseReq.getInstance(appId, appSecret, bizData), CzgH5PayResp.class)); } @@ -52,7 +52,7 @@ public class PolyPayUtils { * @param appSecret 应用密钥 tb_shop_merchant 表中的 app_secret * CzgResult */ - public static CzgResult> jsPay(@NonNull String domain, @NonNull String appId, @NonNull String appSecret, CzgPayBaseReq bizData) { + public static CzgResult> jsPay(@NonNull String domain, @NonNull String appId, @NonNull String appSecret, CzgPayBaseReq bizData) { return execPayResult(sendPolyPay(domain.concat(CzgPayEnum.JS_PAY.getUri()), PolyBaseReq.getInstance(appId, appSecret, bizData), CzgJsPayResp.class)); } @@ -64,7 +64,7 @@ public class PolyPayUtils { * @param appSecret 应用密钥 tb_shop_merchant 表中的 app_secret * CzgResult */ - public static CzgResult> ltPay(@NonNull String domain, @NonNull String appId, @NonNull String appSecret, CzgPayBaseReq bizData) { + public static CzgResult> ltPay(@NonNull String domain, @NonNull String appId, @NonNull String appSecret, CzgPayBaseReq bizData) { return execPayResult(sendPolyPay(domain.concat(CzgPayEnum.LT_PAY.getUri()), PolyBaseReq.getInstance(appId, appSecret, bizData), CzgLtPayResp.class)); } @@ -76,7 +76,7 @@ public class PolyPayUtils { * @param appSecret 应用密钥 tb_shop_merchant 表中的 app_secret * CzgResult */ - public static CzgResult> scanPay(@NonNull String domain, @NonNull String appId, @NonNull String appSecret, CzgPayBaseReq bizData) { + public static CzgResult> scanPay(@NonNull String domain, @NonNull String appId, @NonNull String appSecret, CzgPayBaseReq bizData) { return execPayResult(sendPolyPay(domain.concat(CzgPayEnum.SCAN_PAY.getUri()), PolyBaseReq.getInstance(appId, appSecret, bizData), CzgScanPayResp.class)); } @@ -88,7 +88,7 @@ public class PolyPayUtils { * @param appSecret 应用密钥 tb_shop_merchant 表中的 app_secret * CzgResult */ - public static CzgResult> microPay(@NonNull String domain, @NonNull String appId, @NonNull String appSecret, CzgPayBaseReq bizData) { + public static CzgResult> microPay(@NonNull String domain, @NonNull String appId, @NonNull String appSecret, CzgPayBaseReq bizData) { return execPayResult(sendPolyPay(domain.concat(CzgPayEnum.MICRO_PAY.getUri()), PolyBaseReq.getInstance(appId, appSecret, bizData), CzgMicroPayResp.class)); } diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/PayService.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/PayService.java index 6d1c65eb7..0ab627e73 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/PayService.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/PayService.java @@ -26,7 +26,7 @@ public interface PayService { Long initPayment(OrderPayment payment); //-----------------------------------------------------------------付款 ---------------------------------------------------------- - CzgResult> pay(@NonNull Long shopId, CzgPayEnum payType, CzgPayBaseReq bizData); + CzgResult> pay(@NonNull Long shopId, CzgPayEnum payType, CzgPayBaseReq bizData); //-----------------------------------------------------------------积分商品/拼团 付款 ---------------------------------------------------------- /** diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java index 4521cdc3a..fd779ab37 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java @@ -55,7 +55,7 @@ public class PayServiceImpl implements PayService { private OrderPaymentMapper paymentMapper; @Override - public CzgResult> pay(@NonNull Long shopId, CzgPayEnum payType, CzgPayBaseReq bizData) { + public CzgResult> pay(@NonNull Long shopId, CzgPayEnum payType, CzgPayBaseReq bizData) { ShopMerchant shopMerchant = getMerchant(shopId); PayAdapter adapter = PayAdapterFactory.getAdapter(shopMerchant.getChannel()); String payData = null; @@ -66,7 +66,7 @@ public class PayServiceImpl implements PayService { } bizData.setSubAppid(SystemConstants.PayType.ALIPAY.equals(bizData.getPayType()) ? shopMerchant.getAlipayAppId() : shopMerchant.getWechatAppId()); if (payType.equals(CzgPayEnum.MICRO_PAY)) { - checkMicroPay((CzgPayBaseReq) bizData, shopMerchant); + checkMicroPay(bizData, shopMerchant); } return adapter.pay(payType, payData, getDomain(), getNotifyUrl(shopMerchant.getChannel()), bizData); } @@ -217,8 +217,8 @@ public class PayServiceImpl implements PayService { return notifyUrl; } - private void checkMicroPay(CzgPayBaseReq bizData, ShopMerchant shopMerchant) { - String data = bizData.getData(); + private void checkMicroPay(CzgPayBaseReq bizData, ShopMerchant shopMerchant) { + String data = bizData.getAuthCode(); AssertUtil.isBlank(data, "扫码失败，请重试"); if (data.length() > 26) { throw new CzgException("支付失败，不支持的条码"); diff --git a/cash-service/pay-service/src/main/java/com/czg/PayAdapter.java b/cash-service/pay-service/src/main/java/com/czg/PayAdapter.java index 6ce237089..cc14184eb 100644 --- a/cash-service/pay-service/src/main/java/com/czg/PayAdapter.java +++ b/cash-service/pay-service/src/main/java/com/czg/PayAdapter.java @@ -39,7 +39,7 @@ public interface PayAdapter { * @param bizData 业务数据 */ CzgResult> pay(@NonNull CzgPayEnum payType, @NotBlank String payData, @NotBlank String domain, - @NotBlank String notifyUrl, CzgPayBaseReq bizData); + @NotBlank String notifyUrl, CzgPayBaseReq bizData); CzgResult refund(@NotBlank String domain, @NotBlank String payData, String notifyUrl, CzgRefundReq bizData); diff --git a/cash-service/pay-service/src/main/java/com/czg/impl/NativePayAdapter.java b/cash-service/pay-service/src/main/java/com/czg/impl/NativePayAdapter.java index 6435e759c..0fd1eb417 100644 --- a/cash-service/pay-service/src/main/java/com/czg/impl/NativePayAdapter.java +++ b/cash-service/pay-service/src/main/java/com/czg/impl/NativePayAdapter.java @@ -34,24 +34,21 @@ public class NativePayAdapter implements PayAdapter { } @Override - public CzgResult> pay(@NonNull CzgPayEnum payType, String payData, String domain, String notifyUrl, CzgPayBaseReq bizData) { + public CzgResult> pay(@NonNull CzgPayEnum payType, String payData, String domain, String notifyUrl, CzgPayBaseReq bizData) { try { NativeMerchantDTO polyMerchantDTO = JSONObject.parseObject(payData, NativeMerchantDTO.class); - switch (payType) { + return switch (payType) { // case H5_PAY: // return h5Pay(polyMerchantDTO, domain, notifyUrl, bizData); - case JS_PAY: - return jsPay(polyMerchantDTO, notifyUrl, bizData); - case LT_PAY: - return jsPay(polyMerchantDTO, notifyUrl, bizData); + case JS_PAY -> jsPay(polyMerchantDTO, notifyUrl, bizData); + case LT_PAY -> jsPay(polyMerchantDTO, notifyUrl, bizData); // case SCAN_PAY: // return scanPay(polyMerchantDTO, domain, notifyUrl, bizData); - case MICRO_PAY: + case MICRO_PAY -> //扫码支付 扫描码 - return barPay(polyMerchantDTO, notifyUrl, (CzgPayBaseReq) bizData); - default: - throw new CzgException("原生支付不支持该支付方式: " + bizData.getPayType()); - } + barPay(polyMerchantDTO, notifyUrl, bizData); + default -> throw new CzgException("原生支付不支持该支付方式: " + bizData.getPayType()); + }; } catch (Exception e) { log.error("聚合支付处理失败: {}", e.getMessage(), e); return CzgResult.failure("聚合支付处理失败: " + e.getMessage()); @@ -73,12 +70,12 @@ public class NativePayAdapter implements PayAdapter { return null; } - private CzgResult> jsPay(NativeMerchantDTO merchantDTO, String notifyUrl, CzgPayBaseReq bizData) { + private CzgResult> jsPay(NativeMerchantDTO merchantDTO, String notifyUrl, CzgPayBaseReq bizData) { bizData.setNotifyUrl(notifyUrl); return CzgResult.success(PayManager.jsapiPay(bizData, merchantDTO)); } - private CzgResult> barPay(NativeMerchantDTO merchantDTO, String notifyUrl, CzgPayBaseReq bizData) { + private CzgResult> barPay(NativeMerchantDTO merchantDTO, String notifyUrl, CzgPayBaseReq bizData) { bizData.setNotifyUrl(notifyUrl); return CzgResult.success(PayManager.barPay(bizData, merchantDTO)); } diff --git a/cash-service/pay-service/src/main/java/com/czg/impl/PolyPayAdapter.java b/cash-service/pay-service/src/main/java/com/czg/impl/PolyPayAdapter.java index 3140cbd8a..aeff3bee1 100644 --- a/cash-service/pay-service/src/main/java/com/czg/impl/PolyPayAdapter.java +++ b/cash-service/pay-service/src/main/java/com/czg/impl/PolyPayAdapter.java @@ -32,7 +32,7 @@ public class PolyPayAdapter implements PayAdapter { @Override public CzgResult> pay(@NonNull CzgPayEnum payType, @NotBlank String payData, @NotBlank String domain, - @NotBlank String notifyUrl, CzgPayBaseReq bizData) { + @NotBlank String notifyUrl, CzgPayBaseReq bizData) { try { PolyMerchantDTO polyMerchantDTO = JSONObject.parseObject(payData, PolyMerchantDTO.class); return switch (payType) { @@ -40,8 +40,8 @@ public class PolyPayAdapter implements PayAdapter { case JS_PAY -> jsPay(polyMerchantDTO, domain, notifyUrl, bizData); case LT_PAY -> ltPay(polyMerchantDTO, domain, notifyUrl, bizData); case SCAN_PAY -> scanPay(polyMerchantDTO, domain, notifyUrl, bizData); - case MICRO_PAY -> microPay(polyMerchantDTO, domain, notifyUrl, (CzgPayBaseReq) bizData); - default -> throw new CzgException("聚合支付不支持该支付方式: " + bizData.getPayType()); + case MICRO_PAY -> microPay(polyMerchantDTO, domain, notifyUrl, bizData); + default -> throw new CzgException("聚合支付不支持该支付方式: " + payType); }; } catch (Exception e) { log.error("聚合支付处理失败: {}", e.getMessage(), e); @@ -70,12 +70,12 @@ public class PolyPayAdapter implements PayAdapter { return PolyPayUtils.queryRefundOrder(domain, shopMerchant.getAppId(), shopMerchant.getAppSecret(), mchRefundNo, refundOrderId); } - private CzgResult> h5Pay(PolyMerchantDTO shopMerchant, String domain, String notifyUrl, CzgPayBaseReq bizData) { + private CzgResult> h5Pay(PolyMerchantDTO shopMerchant, String domain, String notifyUrl, CzgPayBaseReq bizData) { bizData.polyBase(shopMerchant.getStoreId(), notifyUrl); return PolyPayUtils.h5Pay(domain, shopMerchant.getAppId(), shopMerchant.getAppSecret(), bizData); } - private CzgResult> jsPay(PolyMerchantDTO shopMerchant, String domain, String notifyUrl, CzgPayBaseReq bizData) { + private CzgResult> jsPay(PolyMerchantDTO shopMerchant, String domain, String notifyUrl, CzgPayBaseReq bizData) { AssertUtil.isBlank(bizData.getSubAppid(), "暂不可用，请联系商家配置" + (SystemConstants.PayType.ALIPAY.equals(bizData.getPayType()) ? "支付宝" : "微信") + "小程序"); bizData.setPayType(SystemConstants.PayType.ALIPAY.equals(bizData.getPayType()) ? "ALIPAY" : "WECHAT"); bizData.polyBase(shopMerchant.getStoreId(), notifyUrl); @@ -83,18 +83,18 @@ public class PolyPayAdapter implements PayAdapter { } - private CzgResult> ltPay(PolyMerchantDTO shopMerchant, String domain, String notifyUrl, CzgPayBaseReq bizData) { + private CzgResult> ltPay(PolyMerchantDTO shopMerchant, String domain, String notifyUrl, CzgPayBaseReq bizData) { AssertUtil.isBlank(bizData.getSubAppid(), "暂不可用，请联系商家配置" + ("aliPay".equals(bizData.getPayType()) ? "支付宝" : "微信") + "小程序"); bizData.polyBase(shopMerchant.getStoreId(), notifyUrl); return PolyPayUtils.ltPay(domain, shopMerchant.getAppId(), shopMerchant.getAppSecret(), bizData); } - private CzgResult> scanPay(PolyMerchantDTO shopMerchant, String domain, String notifyUrl, CzgPayBaseReq bizData) { + private CzgResult> scanPay(PolyMerchantDTO shopMerchant, String domain, String notifyUrl, CzgPayBaseReq bizData) { bizData.polyBase(shopMerchant.getStoreId(), notifyUrl); return PolyPayUtils.scanPay(domain, shopMerchant.getAppId(), shopMerchant.getAppSecret(), bizData); } - private CzgResult> microPay(PolyMerchantDTO shopMerchant, String domain, String notifyUrl, CzgPayBaseReq bizData) { + private CzgResult> microPay(PolyMerchantDTO shopMerchant, String domain, String notifyUrl, CzgPayBaseReq bizData) { bizData.polyBase(shopMerchant.getStoreId(), notifyUrl); return PolyPayUtils.microPay(domain, shopMerchant.getAppId(), shopMerchant.getAppSecret(), bizData); }