"拉卡拉进件支付代码"

pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java

@@ -23,6 +23,7 @@ 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.pos.ReturnFundsReq;
 import cn.pluss.platform.ryx.pay.RyxPayService;
 import cn.pluss.platform.sxf.pay.SxfPayService;
 import cn.pluss.platform.user.impl.GeneralPushUtil;
@@ -479,7 +480,28 @@ public class MerchantOrderController {
         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());
+        return merchantOrderService.posTradeQuery(req.getRequestId(),merchantBaseInfoById.getMerchantCode(),req.getDate(),req.getType(),req.getPage(),req.getSize());
+    }
+
+
+
+
+
+
+
+
+
+    @PostMapping(value = "posTradeQuery")
+    public Result<Object> posReturn(HttpServletRequest request,@RequestBody ReturnFundsReq 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 null;
+
     }
 
 

pluss-model-bundle/src/main/java/cn/pluss/platform/pos/ReturnFundsReq.java

@@ -0,0 +1,12 @@
+package cn.pluss.platform.pos;
+
+import lombok.Data;
+
+@Data
+public class ReturnFundsReq extends  BasePosReq{
+
+
+    private String orderNumber;
+
+    private String sn;
+}

pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/MerchantOrderService.java

@@ -427,6 +427,6 @@ public interface MerchantOrderService extends IService<MerchantOrder> {
 //    void sendPayCallBackArrival(String userId,String orderNumber,Double consumeFee);
 
 
-    Result<Object> posTradeQuery(String merchantCode,String date,String type,Integer page,Integer size);
+    Result<Object> posTradeQuery(String requestId,String merchantCode,String date,String type,Integer page,Integer size);
 }
 

pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java

@@ -2499,7 +2499,7 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
     }
 
     @Override
-    public Result<Object> posTradeQuery(String merchantCode, String date, String type, Integer pageIndex, Integer pageSize) {
+    public Result<Object> posTradeQuery(String requestId,String merchantCode, String date, String type, Integer pageIndex, Integer pageSize) {
         QueryWrapper<MerchantOrder> queryWrapper=new QueryWrapper<>();
 
         queryWrapper.eq("merchantCode",merchantCode);
@@ -2528,6 +2528,12 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
             pageSize=10;
         }
         Page page = new Page<>(pageIndex, pageSize);
+        JSONObject resp=new JSONObject();
+        resp.put("code","0000");
+        resp.put("msg","成功");
+        resp.put("requestId",requestId);
+        resp.put("sign",null);
+        resp.put("signType",null);
       IPage<MerchantOrder> orderIPage=  merchantOrderMapper.selectMapsPage(page,queryWrapper);
       if(ObjectUtil.isNotEmpty(orderIPage)){
         List<MerchantOrder> list=  orderIPage.getRecords();
@@ -2555,11 +2561,13 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
             array.add(object1);
             }
             object.put("records",array);
-            return ResultGenerator.genSuccessResult(object);
+            resp.put("respData",object);
+        }else {
+            resp.put("respData",null);
         }
-
+          resp.put("respData",null);
       }
-        return ResultGenerator.genSuccessResult();
+        return ResultGenerator.genSuccessResult(resp);
     }