czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

去除<?>

Browse Source
This commit is contained in:
wangw
2026-01-14 19:18:03 +08:00
parent c4cb2989b3
commit feee0f8534
12 changed files with 56 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-service/order-service/src/main/java/com/czg/service/order/service/PayService.java
View File

@@ -26,7 +26,7 @@ public interface PayService {
Long initPayment(OrderPayment payment);
//-----------------------------------------------------------------付款 ----------------------------------------------------------
CzgResult<Map<String, Object>> pay(@NonNull Long shopId, CzgPayEnum payType, CzgPayBaseReq<?> bizData);
CzgResult<Map<String, Object>> pay(@NonNull Long shopId, CzgPayEnum payType, CzgPayBaseReq bizData);
//-----------------------------------------------------------------积分商品/拼团 付款 ----------------------------------------------------------
/**

8
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
View File

@@ -55,7 +55,7 @@ public class PayServiceImpl implements PayService {
private OrderPaymentMapper paymentMapper;
@Override
public CzgResult<Map<String, Object>> pay(@NonNull Long shopId, CzgPayEnum payType, CzgPayBaseReq<?> bizData) {
public CzgResult<Map<String, Object>> 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<String>) 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<String> 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("支付失败，不支持的条码");