autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-17 16:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

交易分账 重构

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-28 14:39:16 +08:00
parent fc70b95587
commit 994370f323
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
View File

@@ -361,10 +361,10 @@ public class PayController extends BaseController {
} }
response = new RestApiResponse<>(map); response = new RestApiResponse<>(map);
} catch (BusinessException e) { } catch (BusinessException e) {
logger.warn("wechatpay支付订单 warn param:{}", dto.toString(), e); logger.warn("支付占桩订单 warn param:{}", dto.toString(), e);
response = new RestApiResponse<>(e.getCode(), e.getMessage()); response = new RestApiResponse<>(e.getCode(), e.getMessage());
} catch (Exception e) { } catch (Exception e) {
logger.error("wechatpay支付订单 error param:{}", dto.toString(), e); logger.error("支付占桩订单 error param:{}", dto.toString(), e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_ORDER_PAY_ERROR); response = new RestApiResponse<>(ReturnCodeEnum.CODE_ORDER_PAY_ERROR);
} finally { } finally {
// 支付订单解锁 // 支付订单解锁
@@ -372,7 +372,7 @@ public class PayController extends BaseController {
redisCache.unLock(lockKey); redisCache.unLock(lockKey);
} }
} }
logger.info("wechatpay支付订单 result:{}", JSONObject.toJSONString(response)); logger.info("支付占桩订单 result:{}", JSONObject.toJSONString(response));
return response; return response;
} }

7
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -705,7 +705,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
OrderSettleResult orderSettleResult = orderPaymentSettlementAndRefund(orderBasicInfo); OrderSettleResult orderSettleResult = orderPaymentSettlementAndRefund(orderBasicInfo);
// 记账 // 记账
doUpdateClearingBill(orderSettleResult); // doUpdateClearingBill(orderSettleResult);
// 将卡/vin状态解锁 // 将卡/vin状态解锁
if (!StringUtils.equals("0000000000000000", data.getLogicCard())) { if (!StringUtils.equals("0000000000000000", data.getLogicCard())) {
@@ -749,8 +749,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
logger.info("订单分账逻辑-订单:{}, 查不到一级运营商信息", orderCode); logger.info("订单分账逻辑-订单:{}, 查不到一级运营商信息", orderCode);
return null; return null;
} }
String appId = merchantInfo.getAppId();
String delayMode = merchantInfo.getDelayMode();
// 获取结算账户信息 // 获取结算账户信息
AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId); AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId);
@@ -765,6 +763,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
未使用延时分账的一级运营商 未使用延时分账的一级运营商
*/ */
String delayMode = merchantInfo.getDelayMode();
if (StringUtils.equals(delayMode, Constants.ADAPAY_PAY_MODE_DELAY)) { if (StringUtils.equals(delayMode, Constants.ADAPAY_PAY_MODE_DELAY)) {
// 记账 冻结金额 // 记账 冻结金额
freezeAmount(orderBasicInfo); freezeAmount(orderBasicInfo);
@@ -786,7 +785,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
onlinePaymentOrderRefund(orderBasicInfo); onlinePaymentOrderRefund(orderBasicInfo);
} else { } else {
// 白名单支付 // 白名单支付
logger.info("订单：{}使用白名单支付，不进行退款处理", orderBasicInfo.getOrderCode()); logger.info("订单:{}使用白名单支付，不进行退款处理", orderBasicInfo.getOrderCode());
} }
} catch (Exception e) { } catch (Exception e) {
logger.error("订单退款逻辑异常orderCode:{}", orderBasicInfo.getOrderCode(), e); logger.error("订单退款逻辑异常orderCode:{}", orderBasicInfo.getOrderCode(), e);