|
@@ -176,6 +176,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
result = HttpUtils.sendGet(topApiConfiger.dealSelectUrl, format,null);
|
|
|
}catch (Exception e){
|
|
|
orderError(order);
|
|
|
+ log.error("调用查询订单异常:"+e);
|
|
|
throw new CustomException("调用查询订单异常:"+e);
|
|
|
}
|
|
|
//处理订单
|
|
@@ -246,6 +247,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
//交易等待
|
|
|
payWaiting(order);
|
|
|
}else if ("1".equals(trxstatus)){
|
|
|
+ log.info("订单交易失败++++++++");
|
|
|
Object msg = obj.get("msg");
|
|
|
if (null != msg && "交易不存在".equals(msg.toString())){
|
|
|
|
|
@@ -579,6 +581,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
* @param order
|
|
|
*/
|
|
|
public void payError(Order order){
|
|
|
+ log.info("交易失败传递的参数------------"+order.getOrderNumber());
|
|
|
order.setOrderFlag(OrderStatus.PAYMENT_ERROR_NO_DEBIT.getCode());
|
|
|
this.updateById(order);
|
|
|
}
|
|
@@ -610,13 +613,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
if (treeMap.containsKey(orderNumber)){
|
|
|
Integer count = treeMap.get(orderNumber);
|
|
|
if (count >= 10){
|
|
|
- order.setOrderFlag(OrderStatus.PAYMENT_ERROR_NO_DEBIT.getCode());
|
|
|
- this.updateById(order);
|
|
|
+ log.info("失败的次数"+count);
|
|
|
+ payError(order);
|
|
|
treeMap.remove(orderNumber);
|
|
|
}else {
|
|
|
if (OrderStatus.NO_PAYMENT.getCode().equals(order.getOrderFlag())){
|
|
|
- order.setOrderFlag(OrderStatus.AWAIT_PAY.getCode());
|
|
|
- this.updateById(order);
|
|
|
+ payWaiting(order);
|
|
|
}
|
|
|
treeMap.put(orderNumber,count+1);
|
|
|
}
|