czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增拉卡拉退款接口

Browse Source
This commit is contained in:
韩鹏辉
2023-06-12 14:59:24 +08:00
parent 704ab93093
commit 02b3038538
5 changed files with 83 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,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.BasePosReq;
import cn.pluss.platform.pos.PosTradeQueryReq;
import cn.pluss.platform.pos.ReturnFundsReq;
import cn.pluss.platform.ryx.pay.RyxPayService;
@@ -473,14 +474,16 @@ public class MerchantOrderController {
@PostMapping(value = "orderList")
public Result<Object> posTradeQuery(HttpServletRequest request, @RequestBody PosTradeQueryReq req){
public Result<Object> posTradeQuery(HttpServletRequest request, @RequestBody BasePosReq req){
verify(req.getTimestamp(),req.getRequestId(),req.getAppId(),req.getToken());
DeviceStock deviceStock = deviceStockService.checkBind(req.getSn());
PosTradeQueryReq tradeQueryReq=JSONObject.parseObject(req.getReqData(),PosTradeQueryReq.class);
DeviceStock deviceStock = deviceStockService.checkBind(tradeQueryReq.getSn());
MsgException.checkNull(deviceStock,"不存在的设备信息");
MerchantBaseInfo merchantBaseInfoById = merchantBaseInfoService.getMerchantBaseInfoById(Integer.valueOf(deviceStock.getActMercId()));
MsgException.checkNull(merchantBaseInfoById, "该设备对应的商户信息不存在");
return merchantOrderService.posTradeQuery(req.getRequestId(),merchantBaseInfoById.getMerchantCode(),req.getDate(),req.getType(),req.getPage(),req.getSize());
return merchantOrderService.posTradeQuery(req.getRequestId(),merchantBaseInfoById.getMerchantCode(),tradeQueryReq.getDate(),tradeQueryReq.getType(),tradeQueryReq.getPage(),tradeQueryReq.getSize());
}