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 14:51:35 +08:00
parent 7671e3eeb6
commit 1d10ffa019
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
package cn.pluss.platform.controller; package cn.pluss.platform.controller;
import cn.hutool.json.JSONUtil;
import cn.pluss.platform.IdCardService; import cn.pluss.platform.IdCardService;
import cn.pluss.platform.annotation.OpLog; import cn.pluss.platform.annotation.OpLog;
import cn.pluss.platform.api.PageInfo; 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.merchantOrder.MerchantOrderService;
import cn.pluss.platform.notice.NoticeService; import cn.pluss.platform.notice.NoticeService;
import cn.pluss.platform.pay.PayService; import cn.pluss.platform.pay.PayService;
import cn.pluss.platform.pos.PosTradeQueryReq;
import cn.pluss.platform.ryx.pay.RyxPayService; import cn.pluss.platform.ryx.pay.RyxPayService;
import cn.pluss.platform.sxf.pay.SxfPayService; import cn.pluss.platform.sxf.pay.SxfPayService;
import cn.pluss.platform.user.impl.GeneralPushUtil; import cn.pluss.platform.user.impl.GeneralPushUtil;
@@ -52,6 +54,7 @@ import javax.validation.Valid;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import static cn.hutool.poi.excel.sax.AttributeName.r;
import static cn.hutool.poi.excel.sax.AttributeName.s; import static cn.hutool.poi.excel.sax.AttributeName.s;
@Slf4j @Slf4j
@@ -420,6 +423,7 @@ public class MerchantOrderController {
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "MerchantOrderVo", value = "扫码支付需要传递的参数实例", paramType = "body", dataType = "MerchantOrderVo", required = true)}) @ApiImplicitParam(name = "MerchantOrderVo", value = "扫码支付需要传递的参数实例", paramType = "body", dataType = "MerchantOrderVo", required = true)})
public Result<Object> scanPay(HttpServletRequest request, @RequestBody MerChantOrderDTO merchantOrderDTO) { public Result<Object> scanPay(HttpServletRequest request, @RequestBody MerChantOrderDTO merchantOrderDTO) {
log.info("scanPay>>>>>>>>>>>>{}", JSONUtil.toJsonStr(merchantOrderDTO));
UserApp tokenUa = userAppService.queryUserAppByToken(); UserApp tokenUa = userAppService.queryUserAppByToken();
merchantOrderDTO.setMerchantCode(tokenUa.getMerchantCode()); 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 * @param memberScanPayDTO