|
@@ -54,6 +54,8 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
|
|
|
return PageUtil.pageInfo(baseMapper.queryPage(pageInfo, dto));
|
|
|
}
|
|
|
|
|
|
+ public static final String PAYMENT_ID_NOT_EXISTS = "payment_id_not_exists";
|
|
|
+
|
|
|
@Override
|
|
|
public Map<String, Object> checkTenantOrder(String orderNo) {
|
|
|
TenantOrderRecord orderRecord = this.getOne(new WrapperUtil<TenantOrderRecord>()
|
|
@@ -63,7 +65,15 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
|
|
|
try {
|
|
|
payment = Payment.queryPayment(orderRecord.getTransNo());
|
|
|
log.info("checkTenantOrder payment >>>>> {}", payment);
|
|
|
- if (Objects.nonNull(payment.get("status"))) {
|
|
|
+ boolean flag = false;
|
|
|
+ if (Objects.nonNull(payment.get("error_code"))) {
|
|
|
+ if (!PAYMENT_ID_NOT_EXISTS.equals(payment.get("error_code"))) {
|
|
|
+ //确保订单已经创建
|
|
|
+ flag = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //确保订单已经创建 再 判断状态是成功还是失败
|
|
|
+ if (flag && Objects.nonNull(payment.get("status"))) {
|
|
|
String status = (String) payment.get("status");
|
|
|
if (status.equals("succeeded")) {
|
|
|
orderRecord.setOrderState(1);
|