Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
Jeepay
Commits
f8f5fe46
Commit
f8f5fe46
authored
Jun 16, 2021
by
terrfly
Browse files
解决商户回调报错的问题;
parent
3157a48e
Changes
7
Hide whitespace changes
Inline
Side-by-side
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/payway/AliBar.java
View file @
f8f5fe46
...
...
@@ -63,7 +63,7 @@ public class AliBar extends AlipayPaymentService {
AlipayTradePayModel
model
=
new
AlipayTradePayModel
();
model
.
setOutTradeNo
(
payOrder
.
getPayOrderId
());
model
.
setScene
(
"bar_code"
);
//条码支付 bar_code ; 声波支付 wave_code
model
.
setAuthCode
(
bizRQ
.
getAuthCode
());
//支付授权码
model
.
setAuthCode
(
bizRQ
.
getAuthCode
()
.
trim
()
);
//支付授权码
model
.
setSubject
(
payOrder
.
getSubject
());
//订单标题
model
.
setBody
(
payOrder
.
getBody
());
//订单描述信息
model
.
setTotalAmount
(
AmountUtil
.
convertCent2Dollar
(
payOrder
.
getAmount
().
toString
()));
//支付金额
...
...
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/payway/WxBar.java
View file @
f8f5fe46
...
...
@@ -68,7 +68,7 @@ public class WxBar extends WxpayPaymentService {
request
.
setFeeType
(
"CNY"
);
request
.
setTotalFee
(
payOrder
.
getAmount
().
intValue
());
request
.
setSpbillCreateIp
(
payOrder
.
getClientIp
());
request
.
setAuthCode
(
bizRQ
.
getAuthCode
());
request
.
setAuthCode
(
bizRQ
.
getAuthCode
()
.
trim
()
);
//放置isv信息
WxpayKit
.
putApiIsvInfo
(
mchAppConfigContext
,
request
);
...
...
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/AliBar.java
View file @
f8f5fe46
...
...
@@ -59,7 +59,7 @@ public class AliBar extends YsfpayPaymentService {
res
.
setChannelRetMsg
(
channelRetMsg
);
JSONObject
reqParams
=
new
JSONObject
();
reqParams
.
put
(
"authCode"
,
bizRQ
.
getAuthCode
());
//付款码: 用户 APP 展示的付款条码或二维码
reqParams
.
put
(
"authCode"
,
bizRQ
.
getAuthCode
()
.
trim
()
);
//付款码: 用户 APP 展示的付款条码或二维码
// 云闪付 bar 统一参数赋值
barParamsSet
(
reqParams
,
payOrder
);
...
...
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/WxBar.java
View file @
f8f5fe46
...
...
@@ -58,7 +58,7 @@ public class WxBar extends YsfpayPaymentService {
res
.
setChannelRetMsg
(
channelRetMsg
);
JSONObject
reqParams
=
new
JSONObject
();
reqParams
.
put
(
"authCode"
,
bizRQ
.
getAuthCode
());
//付款码: 用户 APP 展示的付款条码或二维码
reqParams
.
put
(
"authCode"
,
bizRQ
.
getAuthCode
()
.
trim
()
);
//付款码: 用户 APP 展示的付款条码或二维码
// 云闪付 bar 统一参数赋值
barParamsSet
(
reqParams
,
payOrder
);
...
...
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/YsfBar.java
View file @
f8f5fe46
...
...
@@ -59,7 +59,7 @@ public class YsfBar extends YsfpayPaymentService {
res
.
setChannelRetMsg
(
channelRetMsg
);
JSONObject
reqParams
=
new
JSONObject
();
reqParams
.
put
(
"authCode"
,
bizRQ
.
getAuthCode
());
//付款码: 用户 APP 展示的付款条码或二维码
reqParams
.
put
(
"authCode"
,
bizRQ
.
getAuthCode
()
.
trim
()
);
//付款码: 用户 APP 展示的付款条码或二维码
// 云闪付 bar 统一参数赋值
barParamsSet
(
reqParams
,
payOrder
);
...
...
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/payorder/UnifiedOrderController.java
View file @
f8f5fe46
...
...
@@ -94,7 +94,7 @@ public class UnifiedOrderController extends AbstractPayOrderController {
AutoBarOrderRQ
bizRQ
=
(
AutoBarOrderRQ
)
rq
.
buildBizRQ
();
wayCode
=
JeepayKit
.
getPayWayCodeByBarCode
(
bizRQ
.
getAuthCode
());
rq
.
setWayCode
(
wayCode
);
rq
.
setWayCode
(
wayCode
.
trim
()
);
}
if
(
payWayService
.
count
(
PayWay
.
gw
().
eq
(
PayWay:
:
getWayCode
,
wayCode
))
<=
0
){
...
...
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/service/PayMchNotifyService.java
View file @
f8f5fe46
...
...
@@ -75,6 +75,7 @@ public class PayMchNotifyService {
mchNotifyRecord
.
setMchNo
(
dbPayOrder
.
getMchNo
());
mchNotifyRecord
.
setMchOrderNo
(
dbPayOrder
.
getMchOrderNo
());
//商户订单号
mchNotifyRecord
.
setIsvNo
(
dbPayOrder
.
getIsvNo
());
mchNotifyRecord
.
setAppId
(
dbPayOrder
.
getAppId
());
mchNotifyRecord
.
setNotifyUrl
(
notifyUrl
);
mchNotifyRecord
.
setResResult
(
""
);
mchNotifyRecord
.
setNotifyCount
(
0
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment