|
|
|
@@ -106,7 +106,17 @@ public class WxPayOrderController extends BaseController { |
|
|
|
payOrder.setPayOrderStatus(status); |
|
|
|
payOrder.setFailReason(reasonStr); |
|
|
|
try { |
|
|
|
wxPayOrderService.handlePayOrderStatusUpdate(payOrder); |
|
|
|
if(status.equals(EnumPayStatus.PAY_WAY_SUCCESS) && payOrderId > 0) { |
|
|
|
// 有价券不走update, callback更新 |
|
|
|
payOrder = wxPayOrderService.getById(payOrderId); |
|
|
|
if(payOrder.getPayOrderStatus().equals(EnumPayStatus.PAY_WAY_SUCCESS)) { |
|
|
|
return new ResultData(Result.SUCCESS, "支付状态更新成功"); |
|
|
|
} else { |
|
|
|
return new ResultData(ErrorCode.PAY_ORDER_ERROR, "支付未状态,请等待!!"); |
|
|
|
} |
|
|
|
} else { |
|
|
|
wxPayOrderService.handlePayOrderStatusUpdate(payOrder); |
|
|
|
} |
|
|
|
return new ResultData(Result.SUCCESS, "支付状态更新成功"); |
|
|
|
} catch (MallinkException e) { |
|
|
|
logger.error("支付状态更新失败2: " + payOrder.toString() + ", e:" + e.getMessage()); |
|
|
|
|