From f33a410f4d65b200083c3a4b97d51c10ac38bbd9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Aug 2022 18:13:08 +0800
Subject: [PATCH] 20220822
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index fa7e82e..db019c1 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -26,6 +26,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
import cn.hutool.json.JSONObject;
@@ -219,7 +220,7 @@
@Transactional(rollbackFor = Exception.class)
public Map<String, Object> payOrder(PayOrderDto payOrderDto) {
MallMember member = LoginUserUtil.getLoginUser();
- MallOrderInfo orderInfo = this.baseMapper.selectOrderByMemberIdAndId(member.getId(), payOrderDto.getId());
+ MallOrderInfo orderInfo = this.baseMapper.selectOrderDetailsById(payOrderDto.getId());
if (orderInfo == null || AppContants.DEL_FLAG_Y == orderInfo.getDelFlag()) {
throw new FebsException("订单不存在");
}
@@ -342,8 +343,13 @@
}else{
JSONObject jsonObject = JSONUtil.parseObj(agreementSignStr);
payResultStr = (String) jsonObject.get("biz_code");
- if("JS000000" != payResultStr){
- throw new FebsException("支付失败");
+ String signBizMsg = (String) jsonObject.get("biz_msg");
+ String err_msg = (String) jsonObject.get("err_msg");
+ if(!"JS000000".equals(payResultStr)){
+ throw new FebsException(signBizMsg);
+ }
+ if(ObjectUtil.isNotNull(jsonObject.get("err_code"))){
+ throw new FebsException(err_msg);
}
}
@@ -369,8 +375,9 @@
}else{
JSONObject jsonObject = JSONUtil.parseObj(agreementPayStr);
payResultStr = (String) jsonObject.get("biz_code");
+ String payBizMsg = (String) jsonObject.get("biz_msg");
if(!"JS000000".equals(payResultStr)){
- throw new FebsException("支付失败");
+ throw new FebsException(payBizMsg);
}
}
orderInfo.setPayMethod("快捷协议支付");
--
Gitblit v1.9.1