Commit f8f5fe46 authored by terrfly's avatar terrfly
Browse files

解决商户回调报错的问题;

parent 3157a48e
...@@ -63,7 +63,7 @@ public class AliBar extends AlipayPaymentService { ...@@ -63,7 +63,7 @@ public class AliBar extends AlipayPaymentService {
AlipayTradePayModel model = new AlipayTradePayModel(); AlipayTradePayModel model = new AlipayTradePayModel();
model.setOutTradeNo(payOrder.getPayOrderId()); model.setOutTradeNo(payOrder.getPayOrderId());
model.setScene("bar_code"); //条码支付 bar_code ; 声波支付 wave_code model.setScene("bar_code"); //条码支付 bar_code ; 声波支付 wave_code
model.setAuthCode(bizRQ.getAuthCode()); //支付授权码 model.setAuthCode(bizRQ.getAuthCode().trim()); //支付授权码
model.setSubject(payOrder.getSubject()); //订单标题 model.setSubject(payOrder.getSubject()); //订单标题
model.setBody(payOrder.getBody()); //订单描述信息 model.setBody(payOrder.getBody()); //订单描述信息
model.setTotalAmount(AmountUtil.convertCent2Dollar(payOrder.getAmount().toString())); //支付金额 model.setTotalAmount(AmountUtil.convertCent2Dollar(payOrder.getAmount().toString())); //支付金额
......
...@@ -68,7 +68,7 @@ public class WxBar extends WxpayPaymentService { ...@@ -68,7 +68,7 @@ public class WxBar extends WxpayPaymentService {
request.setFeeType("CNY"); request.setFeeType("CNY");
request.setTotalFee(payOrder.getAmount().intValue()); request.setTotalFee(payOrder.getAmount().intValue());
request.setSpbillCreateIp(payOrder.getClientIp()); request.setSpbillCreateIp(payOrder.getClientIp());
request.setAuthCode(bizRQ.getAuthCode()); request.setAuthCode(bizRQ.getAuthCode().trim());
//放置isv信息 //放置isv信息
WxpayKit.putApiIsvInfo(mchAppConfigContext, request); WxpayKit.putApiIsvInfo(mchAppConfigContext, request);
......
...@@ -59,7 +59,7 @@ public class AliBar extends YsfpayPaymentService { ...@@ -59,7 +59,7 @@ public class AliBar extends YsfpayPaymentService {
res.setChannelRetMsg(channelRetMsg); res.setChannelRetMsg(channelRetMsg);
JSONObject reqParams = new JSONObject(); JSONObject reqParams = new JSONObject();
reqParams.put("authCode", bizRQ.getAuthCode()); //付款码: 用户 APP 展示的付款条码或二维码 reqParams.put("authCode", bizRQ.getAuthCode().trim()); //付款码: 用户 APP 展示的付款条码或二维码
// 云闪付 bar 统一参数赋值 // 云闪付 bar 统一参数赋值
barParamsSet(reqParams, payOrder); barParamsSet(reqParams, payOrder);
......
...@@ -58,7 +58,7 @@ public class WxBar extends YsfpayPaymentService { ...@@ -58,7 +58,7 @@ public class WxBar extends YsfpayPaymentService {
res.setChannelRetMsg(channelRetMsg); res.setChannelRetMsg(channelRetMsg);
JSONObject reqParams = new JSONObject(); JSONObject reqParams = new JSONObject();
reqParams.put("authCode", bizRQ.getAuthCode()); //付款码: 用户 APP 展示的付款条码或二维码 reqParams.put("authCode", bizRQ.getAuthCode().trim()); //付款码: 用户 APP 展示的付款条码或二维码
// 云闪付 bar 统一参数赋值 // 云闪付 bar 统一参数赋值
barParamsSet(reqParams, payOrder); barParamsSet(reqParams, payOrder);
......
...@@ -59,7 +59,7 @@ public class YsfBar extends YsfpayPaymentService { ...@@ -59,7 +59,7 @@ public class YsfBar extends YsfpayPaymentService {
res.setChannelRetMsg(channelRetMsg); res.setChannelRetMsg(channelRetMsg);
JSONObject reqParams = new JSONObject(); JSONObject reqParams = new JSONObject();
reqParams.put("authCode", bizRQ.getAuthCode()); //付款码: 用户 APP 展示的付款条码或二维码 reqParams.put("authCode", bizRQ.getAuthCode().trim()); //付款码: 用户 APP 展示的付款条码或二维码
// 云闪付 bar 统一参数赋值 // 云闪付 bar 统一参数赋值
barParamsSet(reqParams, payOrder); barParamsSet(reqParams, payOrder);
......
...@@ -94,7 +94,7 @@ public class UnifiedOrderController extends AbstractPayOrderController { ...@@ -94,7 +94,7 @@ public class UnifiedOrderController extends AbstractPayOrderController {
AutoBarOrderRQ bizRQ = (AutoBarOrderRQ)rq.buildBizRQ(); AutoBarOrderRQ bizRQ = (AutoBarOrderRQ)rq.buildBizRQ();
wayCode = JeepayKit.getPayWayCodeByBarCode(bizRQ.getAuthCode()); wayCode = JeepayKit.getPayWayCodeByBarCode(bizRQ.getAuthCode());
rq.setWayCode(wayCode); rq.setWayCode(wayCode.trim());
} }
if(payWayService.count(PayWay.gw().eq(PayWay::getWayCode, wayCode)) <= 0){ if(payWayService.count(PayWay.gw().eq(PayWay::getWayCode, wayCode)) <= 0){
......
...@@ -75,6 +75,7 @@ public class PayMchNotifyService { ...@@ -75,6 +75,7 @@ public class PayMchNotifyService {
mchNotifyRecord.setMchNo(dbPayOrder.getMchNo()); mchNotifyRecord.setMchNo(dbPayOrder.getMchNo());
mchNotifyRecord.setMchOrderNo(dbPayOrder.getMchOrderNo()); //商户订单号 mchNotifyRecord.setMchOrderNo(dbPayOrder.getMchOrderNo()); //商户订单号
mchNotifyRecord.setIsvNo(dbPayOrder.getIsvNo()); mchNotifyRecord.setIsvNo(dbPayOrder.getIsvNo());
mchNotifyRecord.setAppId(dbPayOrder.getAppId());
mchNotifyRecord.setNotifyUrl(notifyUrl); mchNotifyRecord.setNotifyUrl(notifyUrl);
mchNotifyRecord.setResResult(""); mchNotifyRecord.setResResult("");
mchNotifyRecord.setNotifyCount(0); mchNotifyRecord.setNotifyCount(0);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment