|
@@ -200,8 +200,11 @@ public class NewPayServiceImpl implements NewPayService {
|
|
|
|
|
|
|
|
// 微信商户key
|
|
// 微信商户key
|
|
|
String mchKey = commonInfoService.findOne(435).getValue();
|
|
String mchKey = commonInfoService.findOne(435).getValue();
|
|
|
|
|
+ log.info("商户key获取成功,长度:{}", mchKey.length());
|
|
|
boolean valid = SignUtil.validSignature(map, mchKey);
|
|
boolean valid = SignUtil.validSignature(map, mchKey);
|
|
|
|
|
+ log.info("验签结果:{}", valid);
|
|
|
if (!valid) {
|
|
if (!valid) {
|
|
|
|
|
+ log.error("验签失败,订单号:{}", map.get("traceNo"));
|
|
|
throw new SqxException("验签失败");
|
|
throw new SqxException("验签失败");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -212,6 +215,7 @@ public class NewPayServiceImpl implements NewPayService {
|
|
|
String transTime = map.get("transTime");
|
|
String transTime = map.get("transTime");
|
|
|
if (StrUtil.equals(String.valueOf(PayStateEnums.PAY_SUCCESS.getStateCode()), status)) {
|
|
if (StrUtil.equals(String.valueOf(PayStateEnums.PAY_SUCCESS.getStateCode()), status)) {
|
|
|
PayDetails payDetails = payDetailsService.getByOrderNo(orderNo);
|
|
PayDetails payDetails = payDetailsService.getByOrderNo(orderNo);
|
|
|
|
|
+ log.info("查询订单成功,订单号:{},当前状态:{}", orderNo, payDetails.getState());
|
|
|
if (ObjectUtil.isNull(payDetails)) {
|
|
if (ObjectUtil.isNull(payDetails)) {
|
|
|
log.error("订单【{}】支付成功,但未获取到支付订单!异步通知信息:{}", orderNo, reqJsonData);
|
|
log.error("订单【{}】支付成功,但未获取到支付订单!异步通知信息:{}", orderNo, reqJsonData);
|
|
|
return "success";
|
|
return "success";
|
|
@@ -223,10 +227,12 @@ public class NewPayServiceImpl implements NewPayService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
payDetails.setState(PayStateEnums.PAY_SUCCESS.getStateCode());
|
|
payDetails.setState(PayStateEnums.PAY_SUCCESS.getStateCode());
|
|
|
|
|
+ log.info("准备更新订单状态,订单号:{}", orderNo);
|
|
|
payDetails.setPayTime(transDateStr + " " + transTime);
|
|
payDetails.setPayTime(transDateStr + " " + transTime);
|
|
|
payDetails.setTradeNo(channelTraceNo);
|
|
payDetails.setTradeNo(channelTraceNo);
|
|
|
payDetails.setRemark("RHT PAY SUCCESS");
|
|
payDetails.setRemark("RHT PAY SUCCESS");
|
|
|
payDetailsService.updateDetail(payDetails);
|
|
payDetailsService.updateDetail(payDetails);
|
|
|
|
|
+ log.info("订单更新成功,订单号:{}", orderNo);
|
|
|
|
|
|
|
|
// 后续业务走异步处理
|
|
// 后续业务走异步处理
|
|
|
PayDetails finalPayDetails = payDetails;
|
|
PayDetails finalPayDetails = payDetails;
|