ソースを参照

Merge branch 'release_toaliyun_real_20230228' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_20230228

release_toaliyun_real
xhxu 3年前
コミット
0245282ccb
1個のファイルの変更4行の追加5行の削除
  1. +4
    -5
      mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java

+ 4
- 5
mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java ファイルの表示

@@ -113,14 +113,14 @@ public class WxCardPayController extends BaseController {
return new ResultData(mapList); return new ResultData(mapList);
} }
@ApiOperation(value = "微信B端扫储值卡码支付订单", notes = "params:{\"cardId\":\"String\",\"totalFee\":\"String(元)\"}")
@ApiOperation(value = "微信B端扫储值卡码支付订单", notes = "params:{\"dynamicId\":\"String\",\"totalFee\":\"String(元)\"}")
@PostMapping("scanCard") @PostMapping("scanCard")
public ResultData scanCard(@RequestBody Map<String, String> paramMap, HttpServletRequest request) { public ResultData scanCard(@RequestBody Map<String, String> paramMap, HttpServletRequest request) {
String cardIdStr = paramMap.get("cardId");
String cardIdStr = paramMap.get("dynamicId");
String totalFeeStr = paramMap.get("totalFee"); String totalFeeStr = paramMap.get("totalFee");
if (StringUtils.isBlank(cardIdStr) || cardIdStr.equalsIgnoreCase(Constant.UNDEFINED)) { 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)) { if (StringUtils.isBlank(totalFeeStr) || totalFeeStr.equalsIgnoreCase(Constant.UNDEFINED)) {
@@ -227,8 +227,7 @@ public class WxCardPayController extends BaseController {
Integer payment = totalFee.multiply(new BigDecimal(100)).intValue(); Integer payment = totalFee.multiply(new BigDecimal(100)).intValue();


Long merchantId = null;

Long merchantId = merchantBUser.getMerchantId();
if(payment > cardInfo.getRemainingAmount()) { if(payment > cardInfo.getRemainingAmount()) {
logger.error("卡余额不足: " + cardInfo.getId()); logger.error("卡余额不足: " + cardInfo.getId());
return new ResultData(ErrorCode.CARD_REMAIN_AMOUNT_IS_NOT_ENOUGH); return new ResultData(ErrorCode.CARD_REMAIN_AMOUNT_IS_NOT_ENOUGH);


読み込み中…
キャンセル
保存