From c25b2f4f45a24c5fdc2df10a791cf9decf32fafb Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 20 Jul 2023 16:12:03 +0800 Subject: [PATCH] update --- .../common/enums/ykc/ReturnCodeEnum.java | 2 ++ .../impl/OrderBasicInfoServiceImpl.java | 29 +++++++++++++++++++ .../mapper/pile/AdapayMemberAccountMapper.xml | 1 + 3 files changed, 32 insertions(+) diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java index 9099229ea..8c4ebb833 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java @@ -100,6 +100,8 @@ public enum ReturnCodeEnum { CODE_ORDER_COMPLETE_ERROR("00100047", "该订单已经结算完成!"), + CODE_ADAPAY_MEMBER_IS_NULL_ERROR("00100048", "未查询到该运营商的结算账户"), + /* 个人桩 start */ CODE_PILE_HAS_BEEN_BINDING_ERROR("00400001", "此桩已被绑定,请联系管理员!"), diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 42d471a52..9c055113f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -10,6 +10,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.huifu.adapay.core.exception.BaseAdaPayException; import com.huifu.adapay.model.Payment; +import com.huifu.adapay.model.PaymentConfirm; import com.huifu.adapay.model.PaymentReverse; import com.huifu.adapay.model.Refund; import com.jsowell.adapay.common.CreateAdaPaymentParam; @@ -866,6 +867,34 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { } } + /** + * 订单分账逻辑 + */ + private void ledgerAccount(OrderBasicInfo orderBasicInfo) throws BaseAdaPayException { + // 查询运营商有没有开通结算账户 + String merchantId = orderBasicInfo.getMerchantId(); + AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId); + if (adapayMemberAccount == null) { + throw new BusinessException(ReturnCodeEnum.CODE_ADAPAY_MEMBER_IS_NULL_ERROR); + } + + // 查询订单的交易id + String paymentId = ""; + + // 调汇付的分账接口 确认交易 + Map confirm = Maps.newHashMap(); + confirm.put("payment_id", paymentId); + confirm.put("order_no", "jsdk_confirm_" + System.currentTimeMillis()); + confirm.put("confirm_amt", "0.01"); + confirm.put("description", "description"); + confirm.put("div_members", ""); + Map response = PaymentConfirm.create(confirm); + + + // 保存分账接口返回的信息 + + } + // uniApp 发送停止充电订阅消息 private void sendMsg(OrderBasicInfo orderBasicInfo) { try { diff --git a/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml index 057cb442d..3cd1e67e4 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml @@ -124,6 +124,7 @@ from adapay_member_account where del_flag = '0' + and status = '1' and merchant_id = #{merchantId,jdbcType=VARCHAR}