|
|
|
@@ -121,7 +121,7 @@ public class TtOrderServiceImpl implements TtOrderService { |
|
|
|
order.setPayment(coupon.getSalePrice()); |
|
|
|
if(order.getPayment() == null || order.getPayment().intValue() == 0){ |
|
|
|
order.setOrderStatus(EnumTtOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); |
|
|
|
order.setPaymentTime(now); |
|
|
|
// order.setPaymentTime(now); |
|
|
|
}else{ |
|
|
|
order.setOrderStatus(EnumTtOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); |
|
|
|
} |
|
|
|
@@ -244,6 +244,8 @@ public class TtOrderServiceImpl implements TtOrderService { |
|
|
|
TtOrder orderSuc = new TtOrder(); |
|
|
|
orderSuc.setId(order.getId()); |
|
|
|
orderSuc.setOrderStatus(EnumTtOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); |
|
|
|
orderSuc.setWay(orderQueryResult.getWay()); |
|
|
|
orderSuc.setPaymentTime(orderQueryResult.getPayTime()); |
|
|
|
orderSuc.setUpdateDate(new Date()); |
|
|
|
ttOrderMapper.updateById(orderSuc); |
|
|
|
return new ResultData(ErrorCode.PAY_ORDER_EXIST,"该订单已经支付,请勿重复支付!"); |
|
|
|
@@ -306,8 +308,7 @@ public class TtOrderServiceImpl implements TtOrderService { |
|
|
|
orderSuc.setId(order.getId()); |
|
|
|
orderSuc.setOrderStatus(EnumTtOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); |
|
|
|
orderSuc.setWay(orderQueryResult.getWay()); |
|
|
|
// orderSuc.setPaymentTime(orderQueryResult.getPayTime()); |
|
|
|
logger.info("支付时间格式---"+orderQueryResult.getPayTime()); |
|
|
|
orderSuc.setPaymentTime(orderQueryResult.getPayTime()); |
|
|
|
orderSuc.setUpdateDate(new Date()); |
|
|
|
ttOrderMapper.updateById(orderSuc); |
|
|
|
// return new ResultData(ErrorCode.PAY_ORDER_EXIST,"该订单已经支付,请勿重复支付!"); |
|
|
|
|