|
|
|
@@ -134,12 +134,20 @@ public class WxPayOrderController extends BaseController { |
|
|
|
if (payOrder.getPayOrderStatus().equals(EnumPayStatus.PAY_STATUS_SUCCESS.getCode())) { |
|
|
|
order = wxOrderService.getById(orderId); |
|
|
|
return new ResultData(Result.SUCCESS, "支付状态更新成功", order); |
|
|
|
} else { |
|
|
|
} else{ |
|
|
|
|
|
|
|
return new ResultData(ErrorCode.PAY_ORDER_ERROR, "支付状态未知,请等待!!"); |
|
|
|
} |
|
|
|
} else if (status.equals(EnumPayStatus.PAY_STATUS_FAIL.getCode())) { |
|
|
|
// 有价券支付失败 |
|
|
|
wxPayOrderService.handlePayOrderFail(payOrder, EnumPayStatus.PAY_STATUS_FAIL.getCode()); |
|
|
|
} else if (status.equals(EnumPayStatus.PAY_STATUS_CANCEL.getCode())) { |
|
|
|
//取消支付,更新支付状态为已取消 |
|
|
|
payOrder = wxPayOrderService.getById(payOrderId); |
|
|
|
if (null != payOrder && payOrder.getPayOrderStatus()==EnumPayStatus.PAY_STATUS_WAIT.getCode()) { |
|
|
|
payOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_CANCEL.getCode()); |
|
|
|
wxPayOrderService.saveOrUpdate(payOrder); |
|
|
|
} |
|
|
|
} |
|
|
|
return new ResultData(Result.SUCCESS, "支付状态更新成功"); |
|
|
|
} catch (MallinkException e) { |
|
|
|
|