From 1d10ffa019c9388c2551c0eacce84211e1cc219a Mon Sep 17 00:00:00 2001
From: hankaikai <3233542360@qq.com>
Date: Fri, 9 Jun 2023 14:51:35 +0800
Subject: [PATCH] =?UTF-8?q?"=E6=8B=89=E5=8D=A1=E6=8B=89=E8=BF=9B=E4=BB=B6?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E4=BB=A3=E7=A0=81"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MerchantOrderController.java   | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

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 e93a1c3..937ad49 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
@@ -1,5 +1,6 @@
 package cn.pluss.platform.controller;
 
+import cn.hutool.json.JSONUtil;
 import cn.pluss.platform.IdCardService;
 import cn.pluss.platform.annotation.OpLog;
 import cn.pluss.platform.api.PageInfo;
@@ -21,6 +22,7 @@ import cn.pluss.platform.merchantMenberRecharge.MerchantMenberRechargeService;
 import cn.pluss.platform.merchantOrder.MerchantOrderService;
 import cn.pluss.platform.notice.NoticeService;
 import cn.pluss.platform.pay.PayService;
+import cn.pluss.platform.pos.PosTradeQueryReq;
 import cn.pluss.platform.ryx.pay.RyxPayService;
 import cn.pluss.platform.sxf.pay.SxfPayService;
 import cn.pluss.platform.user.impl.GeneralPushUtil;
@@ -52,6 +54,7 @@ import javax.validation.Valid;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+import static cn.hutool.poi.excel.sax.AttributeName.r;
 import static cn.hutool.poi.excel.sax.AttributeName.s;
 
 @Slf4j
@@ -420,6 +423,7 @@ public class MerchantOrderController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "MerchantOrderVo", value = "扫码支付需要传递的参数实例", paramType = "body", dataType = "MerchantOrderVo", required = true)})
     public Result<Object> scanPay(HttpServletRequest request, @RequestBody MerChantOrderDTO merchantOrderDTO) {
+        log.info("scanPay>>>>>>>>>>>>{}", JSONUtil.toJsonStr(merchantOrderDTO));
         UserApp tokenUa = userAppService.queryUserAppByToken();
         merchantOrderDTO.setMerchantCode(tokenUa.getMerchantCode());
         //校验金额
@@ -466,6 +470,30 @@ public class MerchantOrderController {
         }
     }
 
+
+    @PostMapping(value = "posTradeQuery")
+    public Result<Object> posTradeQuery(HttpServletRequest request, @RequestBody PosTradeQueryReq req){
+
+        verify(req.getTimestamp(),req.getRequestId(),req.getAppId(),req.getToken());
+        DeviceStock deviceStock = deviceStockService.checkBind(req.getSn());
+        MsgException.checkNull(deviceStock,"不存在的设备信息");
+        MerchantBaseInfo merchantBaseInfoById = merchantBaseInfoService.getMerchantBaseInfoById(Integer.valueOf(deviceStock.getActMercId()));
+        MsgException.checkNull(merchantBaseInfoById, "该设备对应的商户信息不存在");
+        return merchantOrderService.posTradeQuery(merchantBaseInfoById.getMerchantCode(),req.getDate(),req.getType(),req.getPage(),req.getSize());
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
     /**
      * 主扫会员支付
      * @param memberScanPayDTO