拉卡拉支付调试修正
This commit is contained in:
parent
3ac2688758
commit
b9f4325c51
@ -203,7 +203,7 @@ public class PayConsumeDepositServiceImpl extends BaseServiceImpl<PayConsumeDepo
|
|||||||
PayConsumeDeposit deposit_row = getOne(deposit_column_row);
|
PayConsumeDeposit deposit_row = getOne(deposit_column_row);
|
||||||
|
|
||||||
if (deposit_row == null) {
|
if (deposit_row == null) {
|
||||||
log.info("#####PayConsumeDeposit:{}#####", notify_row);
|
// log.info("#####PayConsumeDeposit:{}#####", notify_row);
|
||||||
// 增加充值信息
|
// 增加充值信息
|
||||||
if (!saveOrUpdate(notify_row)) {
|
if (!saveOrUpdate(notify_row)) {
|
||||||
throw new ApiException(ResultCode.FAILED);
|
throw new ApiException(ResultCode.FAILED);
|
||||||
|
|||||||
@ -1271,7 +1271,7 @@ public class PayUserPayServiceImpl extends BaseServiceImpl<PayUserPayMapper, Pay
|
|||||||
if(StrUtil.isBlank(order_id)){
|
if(StrUtil.isBlank(order_id)){
|
||||||
order_id = params.getOrDefault("out_trade_no","");
|
order_id = params.getOrDefault("out_trade_no","");
|
||||||
}
|
}
|
||||||
logger.debug("支付回调 params 数据:{}", params);
|
// logger.debug("支付回调 params 数据:{}", params);
|
||||||
|
|
||||||
String authorization = request.getHeader("Authorization");
|
String authorization = request.getHeader("Authorization");
|
||||||
// logger.debug("支付回调 Authorization 数据:{}", authorization);
|
// logger.debug("支付回调 Authorization 数据:{}", authorization);
|
||||||
@ -1284,14 +1284,17 @@ public class PayUserPayServiceImpl extends BaseServiceImpl<PayUserPayMapper, Pay
|
|||||||
// 判断是门店 店铺 平台
|
// 判断是门店 店铺 平台
|
||||||
Integer payment_store_id = 0;
|
Integer payment_store_id = 0;
|
||||||
Integer payment_chain_id = 0;
|
Integer payment_chain_id = 0;
|
||||||
|
String orderSubject ="";
|
||||||
if (!accountBaseConfigService.getTradeModePlantform()) {
|
if (!accountBaseConfigService.getTradeModePlantform()) {
|
||||||
// 不可以联合支付。
|
// 不可以联合支付。
|
||||||
QueryWrapper<PayConsumeTrade> tradeQueryWrapper = new QueryWrapper<>();
|
QueryWrapper<PayConsumeTrade> tradeQueryWrapper = new QueryWrapper<>();
|
||||||
tradeQueryWrapper.eq("order_id", order_id);
|
tradeQueryWrapper.eq("order_id", order_id);
|
||||||
PayConsumeTrade trade_row_tmp = payConsumeTradeService.findOne(tradeQueryWrapper);
|
PayConsumeTrade trade_row_tmp = payConsumeTradeService.findOne(tradeQueryWrapper);
|
||||||
|
|
||||||
// 固定死, 是门店收银还是店铺收银。, 统一店铺收银
|
if(trade_row_tmp!=null) {
|
||||||
payment_store_id = trade_row_tmp.getStore_id();
|
payment_store_id = trade_row_tmp.getStore_id();
|
||||||
|
orderSubject = trade_row_tmp.getTrade_title();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
QueryWrapper<PayPaymentChannel> channelQueryWrapper = new QueryWrapper<>();
|
QueryWrapper<PayPaymentChannel> channelQueryWrapper = new QueryWrapper<>();
|
||||||
@ -1306,6 +1309,8 @@ public class PayUserPayServiceImpl extends BaseServiceImpl<PayUserPayMapper, Pay
|
|||||||
notify_row.setStore_id(payment_store_id); // 所属店铺
|
notify_row.setStore_id(payment_store_id); // 所属店铺
|
||||||
notify_row.setChain_id(payment_chain_id); // 所属门店
|
notify_row.setChain_id(payment_chain_id); // 所属门店
|
||||||
notify_row.setPayment_channel_id(payment_channel_id);
|
notify_row.setPayment_channel_id(payment_channel_id);
|
||||||
|
notify_row.setDeposit_subject(orderSubject);
|
||||||
|
notify_row.setDeposit_body(orderSubject);
|
||||||
|
|
||||||
BigDecimal zero = BigDecimal.ZERO;
|
BigDecimal zero = BigDecimal.ZERO;
|
||||||
|
|
||||||
@ -1332,8 +1337,8 @@ public class PayUserPayServiceImpl extends BaseServiceImpl<PayUserPayMapper, Pay
|
|||||||
return lklNotifyMsg(true, "");
|
return lklNotifyMsg(true, "");
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error("验签发生异常:" + e.getMessage() + ", {}", e);
|
logger.error("通知处理发生异常:" + e.getMessage() + ", {}", e);
|
||||||
return lklNotifyMsg(false, "验签发生异常!");
|
return lklNotifyMsg(false, "通知处理发生异常!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1522,6 +1527,9 @@ public class PayUserPayServiceImpl extends BaseServiceImpl<PayUserPayMapper, Pay
|
|||||||
notify_row.setDeposit_total_fee(deposit_total_fee);
|
notify_row.setDeposit_total_fee(deposit_total_fee);
|
||||||
notify_row.setDeposit_price(BigDecimal.ZERO);
|
notify_row.setDeposit_price(BigDecimal.ZERO);
|
||||||
notify_row.setDeposit_buyer_id(params.get("user_id2"));// openid
|
notify_row.setDeposit_buyer_id(params.get("user_id2"));// openid
|
||||||
|
// notify_row.setDeposit_body();
|
||||||
|
// notify_row.setDeposit_subject();
|
||||||
|
notify_row.setDeposit_gmt_create(deposit_gmt_payment);
|
||||||
notify_row.setDeposit_gmt_payment(deposit_gmt_payment);
|
notify_row.setDeposit_gmt_payment(deposit_gmt_payment);
|
||||||
notify_row.setDeposit_service("JSAPI");
|
notify_row.setDeposit_service("JSAPI");
|
||||||
notify_row.setDeposit_sign(deposit_sign);
|
notify_row.setDeposit_sign(deposit_sign);
|
||||||
@ -1530,6 +1538,7 @@ public class PayUserPayServiceImpl extends BaseServiceImpl<PayUserPayMapper, Pay
|
|||||||
notify_row.setPayment_channel_id(payment_channel_id);
|
notify_row.setPayment_channel_id(payment_channel_id);
|
||||||
|
|
||||||
notify_row.setDeposit_payment_type(StateCode.PAYMENT_TYPE_ONLINE);
|
notify_row.setDeposit_payment_type(StateCode.PAYMENT_TYPE_ONLINE);
|
||||||
|
|
||||||
notify_row.setDeposit_notify_time(new Date());
|
notify_row.setDeposit_notify_time(new Date());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user