From 5ee9707085a51b7b6328086d8f5ba1e570de1513 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Fri, 24 Feb 2023 18:01:12 +0800 Subject: [PATCH 1/2] fix card --- .../java/com/iformall/controller/WxCardPayController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java index 8f8f850c8..ad4e85604 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -113,14 +113,14 @@ public class WxCardPayController extends BaseController { return new ResultData(mapList); } - @ApiOperation(value = "微信B端扫储值卡码支付订单", notes = "params:{\"cardId\":\"String\",\"totalFee\":\"String(元)\"}") + @ApiOperation(value = "微信B端扫储值卡码支付订单", notes = "params:{\"dynamicId\":\"String\",\"totalFee\":\"String(元)\"}") @PostMapping("scanCard") public ResultData scanCard(@RequestBody Map paramMap, HttpServletRequest request) { - String cardIdStr = paramMap.get("cardId"); + String cardIdStr = paramMap.get("dynamicId"); String totalFeeStr = paramMap.get("totalFee"); if (StringUtils.isBlank(cardIdStr) || cardIdStr.equalsIgnoreCase(Constant.UNDEFINED)) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "cardId不能为空"); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "dynamicId不能为空"); } if (StringUtils.isBlank(totalFeeStr) || totalFeeStr.equalsIgnoreCase(Constant.UNDEFINED)) { From 97944f8aed0eeae4b9e61e03b76ab31cf72e5619 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Fri, 24 Feb 2023 18:10:42 +0800 Subject: [PATCH 2/2] fix card --- .../main/java/com/iformall/controller/WxCardPayController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java index ad4e85604..593d4cf93 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -227,8 +227,7 @@ public class WxCardPayController extends BaseController { Integer payment = totalFee.multiply(new BigDecimal(100)).intValue(); - Long merchantId = null; - + Long merchantId = merchantBUser.getMerchantId(); if(payment > cardInfo.getRemainingAmount()) { logger.error("卡余额不足: " + cardInfo.getId()); return new ResultData(ErrorCode.CARD_REMAIN_AMOUNT_IS_NOT_ENOUGH);