diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/NotifyController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/NotifyController.java index ca51011b..28a33d91 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/NotifyController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/NotifyController.java @@ -31,7 +31,7 @@ public class NotifyController { public Object fstPay(@RequestBody Map req) { log.info("接收到福商通支付回调: {}", req); orderInfoService.successPay(req); - return "ok"; + return "SUCCESS"; } @AnonymousAccess @@ -39,6 +39,6 @@ public class NotifyController { public Object fstReturn(@RequestBody Map req) { log.info("接收到福商通退款回调: {}", req); orderInfoService.successReturn(req); - return "ok"; + return "SUCCESS"; } } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java index 0cee4bd8..93112c21 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java @@ -2066,7 +2066,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { orderInfo.setRefundRemark(returnOrderDTO.getNote()); if ("scanCode".equals(payType) || "wx_lite".equals(payType)) { payService.returnOrder(Integer.valueOf(shopId), orderInfo, returnOrderInfo); - orderInfo.setStatus("refunding"); + orderInfo.setStatus("refund"); // 储值卡支付退款 } else if ("deposit".equals(payType)) { orderInfoService.depositReturn(Integer.valueOf(orderInfo.getUserId()), Integer.valueOf(orderInfo.getShopId()), returnOrderInfo.getRefundAmount());