From 31fdb693b7a59ccd3a3b775f3e2c7b7f6993b449 Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 21 Jun 2024 21:41:19 +0800 Subject: [PATCH] fix --- .../controller/WxPayBillController.java | 100 +++++++++--------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxPayBillController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxPayBillController.java index d0d8061cb..76b576ff0 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxPayBillController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxPayBillController.java @@ -122,56 +122,56 @@ public class WxPayBillController extends BaseController { // } // } - @ApiOperation(value = "更新支付订单状态", notes = "{\"payBillId\":\"string\",\"billId\":\"string\",\"status\":integer,\"reason\":\"string\"}") - @PostMapping("/updatePayBill") - public ResultData updatePayBill(@RequestBody Map paramMap) { - logger.info("/api/pay/updatePayBill" + paramMap.toString()); - String billIdStr = (String) paramMap.get("billId"); - String reasonStr = (String) paramMap.get("reason"); - Integer status = (Integer) paramMap.get("status"); - if (StringUtils.isEmpty(billIdStr)) { - logger.info("billId不能为空: " + paramMap.toString()); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "billId不能为空"); - } - Long billId = 0L; - try { - billId = Long.valueOf(billIdStr); - } catch (NumberFormatException e) { - logger.error("billId参数不正确: " + paramMap.toString() + ", e:" + e.getMessage()); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "billId参数不正确"); - } - - - WxPayBill payBill = new WxPayBill(); - payBill.setBillId(billId); - payBill = wxPayBillService.queryPayBill(payBill); - if(payBill==null){ - return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); - } - try { - //前端返回状态成功时 - if(status.equals(EnumPayStatus.PAY_STATUS_SUCCESS.getCode())) { - //查询数据是否已经通过回调修改成功,成功什么也不做,因为已经通过回调修改了数据 - if(payBill.getPayBillStatus().equals(EnumPayStatus.PAY_STATUS_SUCCESS.getCode())) { - return new ResultData(Result.SUCCESS, "支付状态更新成功"); - } - } - //前端返回状态失败时,修改数据状态为支付失败, - if(!billId.equals(payBill.getBillId())){ - logger.info("传入的账单ID与数据表中账单ID不匹配"); - } - payBill.setPayBillStatus(status); - payBill.setFailReason(reasonStr); - wxPayBillService.updatePayBillStatus(payBill); - return new ResultData(Result.SUCCESS, "支付状态更新成功"); - } catch (MallinkException e) { - logger.error("支付状态更新失败2: " + payBill.toString() + ", e:" + e.getMessage()); - return new ResultData(e.getErrorCode(), e.getMessage()); - } catch (Exception e) { - logger.error("支付状态更新失败3: " + payBill.toString() + ", e:" + e.getMessage()); - return new ResultData(ErrorCode.PAY_ORDER_ERROR, "支付状态更新失败3: " + payBill.toString() + ", e:" + e.getMessage()); - } - } +// @ApiOperation(value = "更新支付订单状态", notes = "{\"payBillId\":\"string\",\"billId\":\"string\",\"status\":integer,\"reason\":\"string\"}") +// @PostMapping("/updatePayBill") +// public ResultData updatePayBill(@RequestBody Map paramMap) { +// logger.info("/api/pay/updatePayBill" + paramMap.toString()); +// String billIdStr = (String) paramMap.get("billId"); +// String reasonStr = (String) paramMap.get("reason"); +// Integer status = (Integer) paramMap.get("status"); +// if (StringUtils.isEmpty(billIdStr)) { +// logger.info("billId不能为空: " + paramMap.toString()); +// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "billId不能为空"); +// } +// Long billId = 0L; +// try { +// billId = Long.valueOf(billIdStr); +// } catch (NumberFormatException e) { +// logger.error("billId参数不正确: " + paramMap.toString() + ", e:" + e.getMessage()); +// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "billId参数不正确"); +// } +// +// +// WxPayBill payBill = new WxPayBill(); +// payBill.setBillId(billId); +// payBill = wxPayBillService.queryPayBill(payBill); +// if(payBill==null){ +// return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); +// } +// try { +// //前端返回状态成功时 +// if(status.equals(EnumPayStatus.PAY_STATUS_SUCCESS.getCode())) { +// //查询数据是否已经通过回调修改成功,成功什么也不做,因为已经通过回调修改了数据 +// if(payBill.getPayBillStatus().equals(EnumPayStatus.PAY_STATUS_SUCCESS.getCode())) { +// return new ResultData(Result.SUCCESS, "支付状态更新成功"); +// } +// } +// //前端返回状态失败时,修改数据状态为支付失败, +// if(!billId.equals(payBill.getBillId())){ +// logger.info("传入的账单ID与数据表中账单ID不匹配"); +// } +// payBill.setPayBillStatus(status); +// payBill.setFailReason(reasonStr); +// wxPayBillService.updatePayBillStatus(payBill); +// return new ResultData(Result.SUCCESS, "支付状态更新成功"); +// } catch (MallinkException e) { +// logger.error("支付状态更新失败2: " + payBill.toString() + ", e:" + e.getMessage()); +// return new ResultData(e.getErrorCode(), e.getMessage()); +// } catch (Exception e) { +// logger.error("支付状态更新失败3: " + payBill.toString() + ", e:" + e.getMessage()); +// return new ResultData(ErrorCode.PAY_ORDER_ERROR, "支付状态更新失败3: " + payBill.toString() + ", e:" + e.getMessage()); +// } +// }