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); }