| @@ -98,10 +98,6 @@ public class WxPayOrderController extends BaseController { | |||||
| logger.info("orderId不能为空: " + paramMap.toString()); | logger.info("orderId不能为空: " + paramMap.toString()); | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); | ||||
| } | } | ||||
| if (StringUtils.isBlank(payOrderIdStr)) { | |||||
| logger.info("payOrderId不能为空: " + paramMap.toString()); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "payOrderId不能为空"); | |||||
| } | |||||
| Long payOrderId = 0L, orderId = 0L; | Long payOrderId = 0L, orderId = 0L; | ||||
| try { | try { | ||||
| orderId = Long.valueOf(orderIdStr); | orderId = Long.valueOf(orderIdStr); | ||||
| @@ -132,16 +128,18 @@ public class WxPayOrderController extends BaseController { | |||||
| WxOrder order = null; | WxOrder order = null; | ||||
| try { | try { | ||||
| logger.info(">>>>>>>>>> updaepayorderquerystatus :"+status); | |||||
| //有价券支付成功 | //有价券支付成功 | ||||
| if (status.equals(EnumPayStatus.PAY_STATUS_SUCCESS.getCode())) { | if (status.equals(EnumPayStatus.PAY_STATUS_SUCCESS.getCode())) { | ||||
| // 前端提示支付成功, 不作为支付成功标志,只检查支付订单状态 | // 前端提示支付成功, 不作为支付成功标志,只检查支付订单状态 | ||||
| // 有价券不走update, callback更新 | // 有价券不走update, callback更新 | ||||
| if (payOrderId<=0) { | |||||
| logger.info("payOrderId不能为空: " + paramMap.toString()); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "payOrderId非法"+payOrderId+"[payOrderIdStr:"+payOrderIdStr+"]"); | |||||
| } | |||||
| payOrder = wxPayOrderService.getById(payOrderId); | payOrder = wxPayOrderService.getById(payOrderId); | ||||
| if (null == payOrder) { | if (null == payOrder) { | ||||
| return new ResultData(ErrorCode.PAY_ORDER_ERROR, "未查询到payOrder."); | return new ResultData(ErrorCode.PAY_ORDER_ERROR, "未查询到payOrder."); | ||||
| } | } | ||||
| logger.info(">>>>>>updatePayOrder cur status :"+payOrder.getPayOrderStatus()); | |||||
| if (payOrder.getPayOrderStatus().equals(EnumPayStatus.PAY_STATUS_SUCCESS.getCode())) { | if (payOrder.getPayOrderStatus().equals(EnumPayStatus.PAY_STATUS_SUCCESS.getCode())) { | ||||
| order = wxOrderService.getById(orderId); | order = wxOrderService.getById(orderId); | ||||
| return new ResultData(Result.SUCCESS, "支付状态更新成功", order); | return new ResultData(Result.SUCCESS, "支付状态更新成功", order); | ||||
| @@ -155,7 +153,6 @@ public class WxPayOrderController extends BaseController { | |||||
| WxPayAccount payAccount = wxPayAccountService.getById(appInfo.getPayId()); | WxPayAccount payAccount = wxPayAccountService.getById(appInfo.getPayId()); | ||||
| WxPayOrder wo = wxPayOrderService.handleWxOrderQuery(payOrder, order, appInfo, payAccount, IdWorker.get()); | WxPayOrder wo = wxPayOrderService.handleWxOrderQuery(payOrder, order, appInfo, payAccount, IdWorker.get()); | ||||
| if (null != wo) { | if (null != wo) { | ||||
| logger.info(">>>>>>updatePayOrder handleWxOrderQuery result :"+wo.toString()); | |||||
| return new ResultData(Result.SUCCESS, "支付状态更新成功"); | return new ResultData(Result.SUCCESS, "支付状态更新成功"); | ||||
| } | } | ||||
| return new ResultData(ErrorCode.PAY_ORDER_ERROR, "查询微信订单支付状态失败,请稍后!"); | return new ResultData(ErrorCode.PAY_ORDER_ERROR, "查询微信订单支付状态失败,请稍后!"); | ||||