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

"拉卡拉进件支付代码"

Browse Source
This commit is contained in:
hankaikai
2023-06-09 16:26:53 +08:00
parent 2527ffb4af
commit b370133857
4 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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