|
|
|
@@ -71,7 +71,7 @@ public class TtOrderServiceImpl implements TtOrderService { |
|
|
|
orderQ.setProductId(couponId); |
|
|
|
List<Integer> statuss = new ArrayList<>(); |
|
|
|
statuss.add(EnumTtOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); |
|
|
|
statuss.add(EnumTtOrderStatus.ORDER_STATUS_PAYMENT_ING.getCode()); |
|
|
|
// statuss.add(EnumTtOrderStatus.ORDER_STATUS_PAYMENT_ING.getCode()); |
|
|
|
statuss.add(EnumTtOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); |
|
|
|
orderQ.setStatusS(statuss); |
|
|
|
Integer listCount = ttOrderMapper.findListCount(orderQ); |
|
|
|
@@ -216,8 +216,8 @@ public class TtOrderServiceImpl implements TtOrderService { |
|
|
|
} else if (order.getOrderStatus() == EnumTtOrderStatus.ORDER_STATUS_OVERTIME_CANCEL.getCode()) { |
|
|
|
logger.error("订单已取消: " + order.toString()); |
|
|
|
return new ResultData(ErrorCode.ORDER_HAD_CANCEL); |
|
|
|
} else if(order.getOrderStatus() == EnumTtOrderStatus.ORDER_STATUS_PAYMENT_ING.getCode()){ |
|
|
|
logger.info("订单支付中: " + order.toString()); |
|
|
|
} else if(order.getOrderStatus() == EnumTtOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()){ |
|
|
|
logger.info("订单未支付: " + order.toString()); |
|
|
|
OrderQueryResult orderQueryResult = DouYinPayHelper.orderQuery(appInfo.getAppId(), appInfo.getSecret(), order.getId().toString(), null); |
|
|
|
String trade_state = orderQueryResult.getOrderStatus(); |
|
|
|
if ("PROCESSING".equals(trade_state)) {//处理中 |
|
|
|
@@ -250,13 +250,13 @@ public class TtOrderServiceImpl implements TtOrderService { |
|
|
|
// preOrder.setNotifyUrl();//回调地址 |
|
|
|
|
|
|
|
CreatePreOrderResult preOrderResult = DouYinPayHelper.createPreOrder(preOrder); |
|
|
|
if(preOrderResult.isSuccess()){ |
|
|
|
TtOrder orderSuc = new TtOrder(); |
|
|
|
orderSuc.setId(order.getId()); |
|
|
|
orderSuc.setOrderStatus(EnumTtOrderStatus.ORDER_STATUS_PAYMENT_ING.getCode()); |
|
|
|
orderSuc.setUpdateDate(new Date()); |
|
|
|
ttOrderMapper.updateById(orderSuc); |
|
|
|
} |
|
|
|
// if(preOrderResult.isSuccess()){ |
|
|
|
// TtOrder orderSuc = new TtOrder(); |
|
|
|
// orderSuc.setId(order.getId()); |
|
|
|
// orderSuc.setOrderStatus(EnumTtOrderStatus.ORDER_STATUS_PAYMENT_ING.getCode()); |
|
|
|
// orderSuc.setUpdateDate(new Date()); |
|
|
|
// ttOrderMapper.updateById(orderSuc); |
|
|
|
// } |
|
|
|
return new ResultData(preOrderResult); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -284,7 +284,7 @@ public class TtOrderServiceImpl implements TtOrderService { |
|
|
|
if(appInfo == null) { |
|
|
|
return new ResultData(ErrorCode.APP_ID_NOT_FOUND); |
|
|
|
} |
|
|
|
if(order.getOrderStatus() == EnumTtOrderStatus.ORDER_STATUS_PAYMENT_ING.getCode()){ |
|
|
|
if(order.getOrderStatus() == EnumTtOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()){ |
|
|
|
logger.info("订单支付中: " + order.toString()); |
|
|
|
OrderQueryResult orderQueryResult = DouYinPayHelper.orderQuery(appInfo.getAppId(), appInfo.getSecret(), order.getId().toString(), null); |
|
|
|
String trade_state = orderQueryResult.getOrderStatus(); |
|
|
|
@@ -296,19 +296,21 @@ public class TtOrderServiceImpl implements TtOrderService { |
|
|
|
orderSuc.setOrderStatus(EnumTtOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); |
|
|
|
orderSuc.setUpdateDate(new Date()); |
|
|
|
ttOrderMapper.updateById(orderSuc); |
|
|
|
return new ResultData(ErrorCode.PAY_ORDER_EXIST,"该订单已经支付,请勿重复支付!"); |
|
|
|
// return new ResultData(ErrorCode.PAY_ORDER_EXIST,"该订单已经支付,请勿重复支付!"); |
|
|
|
}else if ("FAIL".equals(trade_state)) {//失败 |
|
|
|
TtOrder orderSuc = new TtOrder(); |
|
|
|
orderSuc.setId(order.getId()); |
|
|
|
orderSuc.setOrderStatus(EnumTtOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); |
|
|
|
orderSuc.setUpdateDate(new Date()); |
|
|
|
ttOrderMapper.updateById(orderSuc); |
|
|
|
// TtOrder orderSuc = new TtOrder(); |
|
|
|
// orderSuc.setId(order.getId()); |
|
|
|
// orderSuc.setOrderStatus(EnumTtOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); |
|
|
|
// orderSuc.setUpdateDate(new Date()); |
|
|
|
// ttOrderMapper.updateById(orderSuc); |
|
|
|
return new ResultData(ErrorCode.PAY_ORDER_ERROR); |
|
|
|
}else if ("TIMEOUT".equals(trade_state)) {//超时 |
|
|
|
TtOrder orderSuc = new TtOrder(); |
|
|
|
orderSuc.setId(order.getId()); |
|
|
|
orderSuc.setOrderStatus(EnumTtOrderStatus.ORDER_STATUS_OVERTIME_CANCEL.getCode()); |
|
|
|
orderSuc.setUpdateDate(new Date()); |
|
|
|
ttOrderMapper.updateById(orderSuc); |
|
|
|
return new ResultData(ErrorCode.PAY_ORDER_CLOSED); |
|
|
|
} |
|
|
|
} |
|
|
|
return new ResultData(); |
|
|
|
|