From ade0f2ad0c06f5cf676aa6dee0b597117f878702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com> Date: Tue, 13 Jun 2023 10:41:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0pos=20=E6=9C=BA=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/controller/MerchantOrderController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java index 0392582..6c17fef 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java @@ -514,15 +514,17 @@ public class MerchantOrderController { @PostMapping(value = "orderRefund") - public Result posReturn(HttpServletRequest request,@RequestBody ReturnFundsReq req){ + public Object posReturn(HttpServletRequest request,@RequestBody BasePosReq req){ verify(req.getTimestamp(),req.getRequestId(),req.getAppId(),req.getToken()); - DeviceStock deviceStock = deviceStockService.checkBind(req.getSn()); + + ReturnFundsReq returnFundsReq=JSONObject.parseObject(req.getReqData(),ReturnFundsReq.class); + DeviceStock deviceStock = deviceStockService.checkBind(returnFundsReq.getSn()); MsgException.checkNull(deviceStock,"不存在的设备信息"); MerchantBaseInfo merchantBaseInfoById = merchantBaseInfoService.getMerchantBaseInfoById(Integer.valueOf(deviceStock.getActMercId())); MsgException.checkNull(merchantBaseInfoById, "该设备对应的商户信息不存在"); - return null; + return merchantOrderService.posReturnFunds(req.getRequestId(),returnFundsReq.getOrderNumber(),returnFundsReq.getRemark(),"pos",null); }