|
@@ -211,6 +211,9 @@ public class FacetofaceService {
|
|
|
closedOrder.setQueryCount(0);
|
|
closedOrder.setQueryCount(0);
|
|
|
closedOrder.setLastQueryTime(null);
|
|
closedOrder.setLastQueryTime(null);
|
|
|
closedOrder.setRejectReason(null);
|
|
closedOrder.setRejectReason(null);
|
|
|
|
|
+ // signAndAuth/rate 固定为后端值,不再由前端传入(DB 列有 NOT NULL 约束)
|
|
|
|
|
+ closedOrder.setSignAndAuth(true);
|
|
|
|
|
+ closedOrder.setRate("0.6");
|
|
|
mapper.updateById(closedOrder);
|
|
mapper.updateById(closedOrder);
|
|
|
return BeanUtil.copyProperties(mapper.selectById(closedOrder.getId()), F2fOrderVO.class);
|
|
return BeanUtil.copyProperties(mapper.selectById(closedOrder.getId()), F2fOrderVO.class);
|
|
|
}
|
|
}
|
|
@@ -229,6 +232,9 @@ public class FacetofaceService {
|
|
|
e.setReExpiresIn(confirmResponse.getReExpiresIn());
|
|
e.setReExpiresIn(confirmResponse.getReExpiresIn());
|
|
|
e.setNextQueryTime(now.plusMinutes(5));
|
|
e.setNextQueryTime(now.plusMinutes(5));
|
|
|
e.setQueryCount(0);
|
|
e.setQueryCount(0);
|
|
|
|
|
+ // signAndAuth/rate 固定为后端值,不再由前端传入(DB 列有 NOT NULL 约束)
|
|
|
|
|
+ e.setSignAndAuth(true);
|
|
|
|
|
+ e.setRate("0.6");
|
|
|
mapper.insert(e);
|
|
mapper.insert(e);
|
|
|
|
|
|
|
|
return BeanUtil.copyProperties(mapper.selectById(e.getId()), F2fOrderVO.class);
|
|
return BeanUtil.copyProperties(mapper.selectById(e.getId()), F2fOrderVO.class);
|
|
@@ -294,6 +300,9 @@ public class FacetofaceService {
|
|
|
if (StrUtil.isNotBlank(queryResponse.getRejectReason())) {
|
|
if (StrUtil.isNotBlank(queryResponse.getRejectReason())) {
|
|
|
e.setRejectReason(queryResponse.getRejectReason());
|
|
e.setRejectReason(queryResponse.getRejectReason());
|
|
|
}
|
|
}
|
|
|
|
|
+ if (StrUtil.isNotBlank(queryResponse.getAgentAppId())) {
|
|
|
|
|
+ e.setAuthAppId(queryResponse.getAgentAppId());
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
String alipayStatus = queryResponse.getOrderStatus();
|
|
String alipayStatus = queryResponse.getOrderStatus();
|
|
|
if (alipayStatus != null) {
|
|
if (alipayStatus != null) {
|
|
@@ -438,17 +447,17 @@ public class FacetofaceService {
|
|
|
|
|
|
|
|
/** 查询交易状态 — 调用 alipay.trade.query */
|
|
/** 查询交易状态 — 调用 alipay.trade.query */
|
|
|
public F2fTradeVO queryTrade(F2fTradeQueryDTO dto) {
|
|
public F2fTradeVO queryTrade(F2fTradeQueryDTO dto) {
|
|
|
- FacetofaceOrderEntity order = getSuccessOrder(dto.getEnterpriseId());
|
|
|
|
|
|
|
+ FacetofaceOrderEntity order = getSuccessOrder(dto.getEnterprise_id());
|
|
|
|
|
|
|
|
try {
|
|
try {
|
|
|
AlipayTradeQueryModel model = new AlipayTradeQueryModel();
|
|
AlipayTradeQueryModel model = new AlipayTradeQueryModel();
|
|
|
- model.setOutTradeNo(dto.getOutTradeNo());
|
|
|
|
|
|
|
+ model.setOutTradeNo(dto.getOut_trade_no());
|
|
|
|
|
|
|
|
AlipayTradeQueryRequest request = new AlipayTradeQueryRequest();
|
|
AlipayTradeQueryRequest request = new AlipayTradeQueryRequest();
|
|
|
request.setBizModel(model);
|
|
request.setBizModel(model);
|
|
|
request.putOtherTextParam("app_auth_token", order.getAppAuthToken());
|
|
request.putOtherTextParam("app_auth_token", order.getAppAuthToken());
|
|
|
|
|
|
|
|
- AlipayTradeQueryResponse response = alipayClientFactory.getClient(dto.getEnterpriseId(), ServiceProviderBizType.FACETOFACE_NOTIFY.getValue()).execute(request);
|
|
|
|
|
|
|
+ AlipayTradeQueryResponse response = alipayClientFactory.getClient(dto.getEnterprise_id(), ServiceProviderBizType.FACETOFACE_NOTIFY.getValue()).execute(request);
|
|
|
|
|
|
|
|
if (!response.isSuccess()) {
|
|
if (!response.isSuccess()) {
|
|
|
throw new BusinessException(400, "查询交易状态失败: " +
|
|
throw new BusinessException(400, "查询交易状态失败: " +
|
|
@@ -456,7 +465,7 @@ public class FacetofaceService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
F2fTradeVO vo = new F2fTradeVO();
|
|
F2fTradeVO vo = new F2fTradeVO();
|
|
|
- vo.setOutTradeNo(dto.getOutTradeNo());
|
|
|
|
|
|
|
+ vo.setOutTradeNo(dto.getOut_trade_no());
|
|
|
vo.setTradeNo(response.getTradeNo());
|
|
vo.setTradeNo(response.getTradeNo());
|
|
|
vo.setTotalAmount(response.getTotalAmount());
|
|
vo.setTotalAmount(response.getTotalAmount());
|
|
|
vo.setTradeStatus(response.getTradeStatus());
|
|
vo.setTradeStatus(response.getTradeStatus());
|