dataMap = JSONUtil.toBean(reqBody, HashMap.class);
+
+ // 退款编号
+ String refundCode = dataMap.get("refundRequestNum");
+ // 京东交易流水号
+ String refundNumber = dataMap.get("orderNum");
+ // 退款完成时间
+ Date finishTime = DateUtils.parseDate(dataMap.get("refundSuccessTime"), DateUtils.YYYY_MM_DD_HH_MM_SS);
+ // 退款金额
+ BigDecimal finishMoney = new BigDecimal(dataMap.get("refundAmount"));
+
+ if (JdPayConstants.ORDER_SUCCESS.equals(dataMap.get("refundStatus"))) {
+ // 退款成功
+ // 退款后续业务处理
+ if (iRefundService.notifyHandle(EPayChannel.JD, refundCode, refundNumber, finishTime, finishMoney)) {
+ return JdPayConstants.RETURN_SUCCESS;
+ }
+ } else {
+ // 退款失败
+ log.error("京东退款失败： {}", dataMap.get("failReason"));
+
+ if (iRefundService.notifyErrorHandle(EPayChannel.JD, refundCode, refundNumber, dataMap.get("failReason"))) {
+ return JdPayConstants.RETURN_SUCCESS;
+ }
+ }
+ } else {
+ log.error("京东支付回调签名校验失败！");
+ }
+ } catch (Exception e) {
+ log.error("京东支付回调处理异常", e);
+ }
+ return JdPayConstants.RETURN_FAIL;
+ }
+
+
+ @Resource
+ private JdPay jdPay;
+
+ /**
+ * 京东收银台处理成功返回
+ */
+ private static final String SUCCESS = "SUCCESS";
+ /**
+ * 京东收银台处理失败返回
+ */
+ private static final String ERROR = "ERROR";
+
+ /**
+ * 京东收银台退款异步支付回调
+ *
+ * @param reqText
+ * @return 成功返回"SUCCESS", 失败返回"ERROR",退款通知会再次发起通知，通知频次见接口文档。
+ */
+ @PostMapping("/trade-notify")
+ public String tradeNotify(@RequestBody String reqText) {
+ log.info("京东收银台退款异步回调！ reqText： {}", reqText);
+ try {
+ // 验证签名与解密
+ String interData = jdPay.verifyResponse(reqText);
+ JdPayRefundSuccessNotify successNotify = GsonUtil.fromJson(interData, JdPayRefundSuccessNotify.class);
+ if (null != successNotify) {
+ if ("FINI".equals(successNotify.getTradeStatus())) {
+
+ // 退款编号
+ String refundCode = successNotify.getOutTradeNo();
+ // 京东交易流水号
+ String refundNumber = successNotify.getTradeNo();
+ // 退款完成时间
+ Date finishTime = DateUtils.parseDate(successNotify.getFinishDate(), DateUtils.YAMMERERS);
+ // 退款金额
+ int tradeAmount = Integer.parseInt(successNotify.getTradeAmount());
+ BigDecimal finishMoney = new BigDecimal(tradeAmount).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP);
+
+ // 退款后续业务处理
+ if (iRefundService.notifyHandle(EPayChannel.JD, refundCode, refundNumber, finishTime, finishMoney)) {
+ return SUCCESS;
+ }
+ } else {
+ log.error("京东收银台退款异步回调失败，resultDesc: {}", successNotify.getResultDesc());
+ }
+ } else {
+ log.error("京东收银台退款异步回调解密为空");
+ }
+ } catch (Exception e) {
+ log.error("京东收银台退款异步回调异常", e);
+ }
+ return ERROR;
+ }
+
+}
diff --git a/bd-third/src/main/java/com/hzs/third/pay/jdpay/dto/JdPayRefundSuccessNotify.java b/bd-third/src/main/java/com/hzs/third/pay/jdpay/dto/JdPayRefundSuccessNotify.java
new file mode 100644
index 00000000..e3b25444
--- /dev/null
+++ b/bd-third/src/main/java/com/hzs/third/pay/jdpay/dto/JdPayRefundSuccessNotify.java
@@ -0,0 +1,66 @@
+package com.hzs.third.pay.jdpay.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 退款成功通知
+ * @Author: jiang chao
+ * @Time: 2025/3/21 10:24
+ * @Classname: JdPayRefundSuccessNotify
+ * @PackageName: com.hzs.third.pay.jdpay.dto
+ */
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class JdPayRefundSuccessNotify implements Serializable {
+
+ /**
+ * 业务结果
+ */
+ private String resultCode;
+ /**
+ * 响应描述
+ */
+ private String resultDesc;
+
+ /**
+ * 京东退款订单号
+ */
+ private String tradeNo;
+
+ /**
+ * 商户退款订单号
+ */
+ private String outTradeNo;
+ /**
+ * 商户原正单订单号
+ */
+ private String originalOutTradeNo;
+ /**
+ * 订单总金额
+ */
+ private String tradeAmount;
+ /**
+ * 退款完成时间
+ */
+ private String finishDate;
+ /**
+ * 交易状态
+ */
+ private String tradeStatus;
+ /**
+ * 回传字段
+ */
+ private String returnParams;
+ /**
+ * 币种
+ */
+ private String currency;
+
+}
diff --git a/bd-third/src/main/java/com/hzs/third/pay/jdpay/dto/JdPayTradeSuccessNotify.java b/bd-third/src/main/java/com/hzs/third/pay/jdpay/dto/JdPayTradeSuccessNotify.java
new file mode 100644
index 00000000..a42ba4fb
--- /dev/null
+++ b/bd-third/src/main/java/com/hzs/third/pay/jdpay/dto/JdPayTradeSuccessNotify.java
@@ -0,0 +1,98 @@
+package com.hzs.third.pay.jdpay.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 交易成功通知
+ * @Author: jiang chao
+ * @Time: 2025/3/21 10:24
+ * @Classname: JdPayRefundSuccessNotify
+ * @PackageName: com.hzs.third.pay.jdpay.dto
+ */
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class JdPayTradeSuccessNotify implements Serializable {
+
+ /**
+ * 业务结果
+ */
+ private String resultCode;
+ /**
+ * 响应描述
+ */
+ private String resultDesc;
+
+ /**
+ * 京东交易订单号
+ */
+ private String tradeNo;
+
+ /**
+ * 商户订单号
+ */
+ private String outTradeNo;
+ /**
+ * 订单总金额
+ */
+ private String tradeAmount;
+ /**
+ * 币种
+ */
+ private String currency;
+ /**
+ * 支付完成时间
+ */
+ private String finishDate;
+ /**
+ * 交易类型
+ */
+ private String tradeType;
+ /**
+ * 交易状态
+ */
+ private String tradeStatus;
+ /**
+ * 回传字段
+ */
+ private String returnParams;
+ /**
+ * 请求的端
+ */
+ private String clientType;
+ /**
+ * 商户用户标识
+ */
+ private String userId;
+ /**
+ * 优惠金额
+ */
+ private String discountAmount;
+ /**
+ * 支付工具
+ */
+ private String payTool;
+ /**
+ * 掩码卡号
+ */
+ private String maskCardNo;
+ /**
+ * 卡类型
+ */
+ private String cardType;
+ /**
+ * 银行编码
+ */
+ private String bankCode;
+ /**
+ * 白条分期数
+ */
+ private String installmentNum;
+
+}
diff --git a/bd-third/src/main/java/com/hzs/third/pay/mapper/TOnlinePaymentSepAccDMapper.java b/bd-third/src/main/java/com/hzs/third/pay/mapper/TOnlinePaymentSepAccDMapper.java
new file mode 100644
index 00000000..2d355e24
--- /dev/null
+++ b/bd-third/src/main/java/com/hzs/third/pay/mapper/TOnlinePaymentSepAccDMapper.java
@@ -0,0 +1,16 @@
+package com.hzs.third.pay.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hzs.common.domain.third.pay.TOnlinePaymentSepAccD;
+
+/**
+ *
+ * 支付请求子表(分账) Mapper 接口
+ *
+ *
+ * @author bd
+ * @since 2025-07-01
+ */
+public interface TOnlinePaymentSepAccDMapper extends BaseMapper {
+
+}
diff --git a/bd-third/src/main/java/com/hzs/third/pay/mapper/TOnlinePaymentSepAccMapper.java b/bd-third/src/main/java/com/hzs/third/pay/mapper/TOnlinePaymentSepAccMapper.java
new file mode 100644
index 00000000..64655522
--- /dev/null
+++ b/bd-third/src/main/java/com/hzs/third/pay/mapper/TOnlinePaymentSepAccMapper.java
@@ -0,0 +1,16 @@
+package com.hzs.third.pay.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hzs.common.domain.third.pay.TOnlinePaymentSepAcc;
+
+/**
+ *
+ * 支付请求主表 Mapper 接口
+ *
+ *
+ * @author bd
+ * @since 2025-07-01
+ */
+public interface TOnlinePaymentSepAccMapper extends BaseMapper {
+
+}
diff --git a/bd-third/src/main/java/com/hzs/third/pay/service/IRefundService.java b/bd-third/src/main/java/com/hzs/third/pay/service/IRefundService.java
index d1405669..68f5cafa 100644
--- a/bd-third/src/main/java/com/hzs/third/pay/service/IRefundService.java
+++ b/bd-third/src/main/java/com/hzs/third/pay/service/IRefundService.java
@@ -44,4 +44,23 @@ public interface IRefundService {
*/
boolean notifyErrorHandle(EPayChannel ePayChannel, String refundCode, String refundNumber, String errorMsg);
+
+ /**
+ * 京东退款处理
+ *
+ * @param refundDTO 业务类型
+ * @param tOnlinePayment 退款对应支付信息
+ * @return
+ */
+ String jdRefundHandle(RefundDTO refundDTO, TOnlinePayment tOnlinePayment);
+
+ /**
+ * 京东收银台退款处理
+ *
+ * @param refundDTO 业务类型
+ * @param tOnlinePayment 退款对应支付信息
+ * @return
+ */
+ String jdCashRefundHandle(RefundDTO refundDTO, TOnlinePayment tOnlinePayment);
+
}
diff --git a/bd-third/src/main/java/com/hzs/third/pay/service/ITOnlinePaymentSepAccDService.java b/bd-third/src/main/java/com/hzs/third/pay/service/ITOnlinePaymentSepAccDService.java
new file mode 100644
index 00000000..4cf631ee
--- /dev/null
+++ b/bd-third/src/main/java/com/hzs/third/pay/service/ITOnlinePaymentSepAccDService.java
@@ -0,0 +1,16 @@
+package com.hzs.third.pay.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hzs.common.domain.third.pay.TOnlinePaymentSepAccD;
+
+/**
+ *
+ * 支付请求子表(分账) 服务类
+ *
+ *
+ * @author bd
+ * @since 2025-07-01
+ */
+public interface ITOnlinePaymentSepAccDService extends IService {
+
+}
diff --git a/bd-third/src/main/java/com/hzs/third/pay/service/ITOnlinePaymentSepAccService.java b/bd-third/src/main/java/com/hzs/third/pay/service/ITOnlinePaymentSepAccService.java
new file mode 100644
index 00000000..dd382d26
--- /dev/null
+++ b/bd-third/src/main/java/com/hzs/third/pay/service/ITOnlinePaymentSepAccService.java
@@ -0,0 +1,16 @@
+package com.hzs.third.pay.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hzs.common.domain.third.pay.TOnlinePaymentSepAcc;
+
+/**
+ *
+ * 支付请求主表 服务类
+ *
+ *
+ * @author bd
+ * @since 2025-07-01
+ */
+public interface ITOnlinePaymentSepAccService extends IService {
+ void saveOrUpdateReq(TOnlinePaymentSepAcc tOnlinePaymentSepAcc);
+}
diff --git a/bd-third/src/main/java/com/hzs/third/pay/service/impl/JdPayServiceImpl.java b/bd-third/src/main/java/com/hzs/third/pay/service/impl/JdPayServiceImpl.java
index b6e58684..d3a17d31 100644
--- a/bd-third/src/main/java/com/hzs/third/pay/service/impl/JdPayServiceImpl.java
+++ b/bd-third/src/main/java/com/hzs/third/pay/service/impl/JdPayServiceImpl.java
@@ -1,5 +1,6 @@
package com.hzs.third.pay.service.impl;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONUtil;
import com.hzs.common.core.config.BdConfig;
import com.hzs.common.core.domain.R;
@@ -9,7 +10,11 @@ import com.hzs.common.core.enums.EEnv;
import com.hzs.common.core.utils.DateUtils;
import com.hzs.common.domain.third.pay.TOnlineCard;
import com.hzs.common.domain.third.pay.TOnlinePayment;
+import com.hzs.common.domain.third.pay.TOnlinePaymentSepAcc;
+import com.hzs.common.domain.third.pay.TOnlinePaymentSepAccD;
import com.hzs.third.pay.config.JdPayConfig;
+import com.hzs.third.pay.config.JdPayProperties;
+import com.hzs.third.pay.config.JdPaySeparateAccountConfig;
import com.hzs.third.pay.constants.JdPayConstants;
import com.hzs.third.pay.constants.PayRedisConstants;
import com.hzs.third.pay.dto.jd.JdFastDTO;
@@ -20,9 +25,14 @@ import com.hzs.third.pay.enums.EJdAppType;
import com.hzs.third.pay.enums.EJdTerminalType;
import com.hzs.third.pay.jdpay.dto.JdPayAggregateCreateOrderRequest;
import com.hzs.third.pay.jdpay.dto.JdPayAggregateCreateOrderResponse;
+import com.hzs.third.pay.jdpay.dto.JdPayDivisionAccount;
+import com.hzs.third.pay.jdpay.dto.JdPayDivisionAccountTradeInfo;
import com.hzs.third.pay.jdpay.sdk.JdPay;
+import com.hzs.third.pay.jdpay.util.GsonUtil;
import com.hzs.third.pay.service.IJdPayService;
import com.hzs.third.pay.service.ITOnlineCardService;
+import com.hzs.third.pay.service.ITOnlinePaymentSepAccService;
+import com.hzs.third.pay.service.ITOnlinePaymentService;
import com.hzs.third.pay.util.JdPayUtil;
import com.hzs.third.pay.util.PayUtil;
import lombok.extern.slf4j.Slf4j;
@@ -34,6 +44,8 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.List;
import java.util.concurrent.TimeUnit;
/**
@@ -49,9 +61,15 @@ public class JdPayServiceImpl implements IJdPayService {
private ITOnlineCardService itOnlineCardService;
@Resource
private JdPay jdPay;
-
+ @Autowired
+ private JdPayProperties jdPayProperties;
@Autowired
private RedisTemplate redisTemplate;
+ @Autowired
+ private ITOnlinePaymentSepAccService itOnlinePaymentSepAccService;
+
+ @Autowired
+ private ITOnlinePaymentService itOnlinePaymentService;
/**
* 页面回调地址
@@ -241,12 +259,24 @@ public class JdPayServiceImpl implements IJdPayService {
// 请求京东支付接口
JdPayAggregateCreateOrderResponse response = jdPay.aggregateCreateOrder(request);
-
+ TOnlinePaymentSepAcc sepAcc = TOnlinePaymentSepAcc.builder()
+ .sepAccDList(sepAccDList)
+ .reqContent(request.getDivisionAccount())
+ .reqContentSepAcc(JSONUtil.toJsonStr(divisionAccountTradeInfoList))
+ .version(divisionAccount.getVersion())
+ .respContent(JSONUtil.toJsonStr(response))
+ .tradeAmount(onlinePayment.getPayMoney())
+ .build();
if ("0000".equals(response.getResultCode())) {
// 请求响应成功
// 京东唯一订单号
onlinePayment.setPayNumber(response.getTradeNo());
-
+ // 将controller内入库逻辑移至此为止
+ onlinePayment.setPayMoney(null);
+ itOnlinePaymentService.saveOrUpdate(onlinePayment);
+ // 2025年7月1日 保存分账主表&子表
+ sepAcc.setPkPayment(onlinePayment.getPkId());
+ itOnlinePaymentSepAccService.saveOrUpdateReq(sepAcc);
if ("AGGRE_QR".equals(tradeType)) {
return R.ok(response.getQrCode());
}
@@ -261,4 +291,5 @@ public class JdPayServiceImpl implements IJdPayService {
}
}
+
}
diff --git a/bd-third/src/main/java/com/hzs/third/pay/service/impl/RefundServiceImpl.java b/bd-third/src/main/java/com/hzs/third/pay/service/impl/RefundServiceImpl.java
index 9d747ee8..8d93de4c 100644
--- a/bd-third/src/main/java/com/hzs/third/pay/service/impl/RefundServiceImpl.java
+++ b/bd-third/src/main/java/com/hzs/third/pay/service/impl/RefundServiceImpl.java
@@ -1,5 +1,6 @@
package com.hzs.third.pay.service.impl;
+import cn.hutool.json.JSONUtil;
import com.hzs.common.core.domain.R;
import com.hzs.common.core.enums.*;
import com.hzs.common.core.utils.*;
@@ -10,14 +11,20 @@ import com.hzs.sale.refund.ISaRefundServiceApi;
import com.hzs.third.pay.config.*;
import com.hzs.third.pay.constants.*;
import com.hzs.third.pay.dto.RefundDTO;
+import com.hzs.third.pay.jdpay.dto.JdPayRefundRequest;
+import com.hzs.third.pay.jdpay.dto.JdPayRefundResponse;
+import com.hzs.third.pay.jdpay.sdk.JdPay;
import com.hzs.third.pay.service.IAllInPayService;
import com.hzs.third.pay.service.IRefundService;
import com.hzs.third.pay.service.ITOnlineRefundService;
+import com.hzs.third.pay.util.JdPayUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.math.BigDecimal;
import java.net.InetAddress;
import java.util.*;
@@ -35,9 +42,17 @@ public class RefundServiceImpl implements IRefundService {
private IAllInPayService iAllInPayService;
@Autowired
private ITOnlineRefundService itOnlineRefundService;
+ @Autowired
+ private JdPayConfig jdPayConfig;
@DubboReference
ISaRefundServiceApi iSaRefundServiceApi;
+ @Value("${jd.pay.refundNotifyUrl}")
+ private String refundNotifyUrl;
+
+ @Resource
+ private JdPay jdPay;
+
@Override
public String allInRefundHandle(RefundDTO refundDTO, TOnlinePayment tOnlinePayment) {
@@ -251,4 +266,135 @@ public class RefundServiceImpl implements IRefundService {
return false;
}
+
+ @Override
+ public String jdRefundHandle(RefundDTO refundDTO, TOnlinePayment tOnlinePayment) {
+ try {
+ // 退款金额（默认按全款退）
+ BigDecimal amount = tOnlinePayment.getPayMoney();
+ if (null != refundDTO.getRefundAmount()) {
+ // 如果传入实际退款金额，则按实际退款金额处理
+ amount = refundDTO.getRefundAmount();
+ }
+
+ // 退款编号
+ String refundCode = CommonUtil.createSerialNumber(EOrderPrefix.REFUND_CODE);
+
+ Map requestMap = new HashMap<>();
+ requestMap.put("version", JdPayConstants.PAY_VERSION);
+ // 商户编号
+ requestMap.put("customerNum", jdPayConfig.getCustomerNum());
+ // 店铺编号
+ requestMap.put("shopNum", jdPayConfig.getShopNum());
+
+ // 商户订单号
+ requestMap.put("requestNum", tOnlinePayment.getOriginalOrder());
+ // 商户退款订单号
+ requestMap.put("refundRequestNum", refundCode);
+ // 退款金额
+ requestMap.put("refundPartAmount", amount.toString());
+ // 退款回调地址
+ requestMap.put("callbackUrl", jdPayConfig.getRefundCallbackUrl());
+
+ String body = JSONUtil.toJsonStr(requestMap);
+
+ log.info("京东退款请求参数： {}", body);
+
+ String postResult = JdPayUtil.requestOrder(JdPayConstants.REFUND_ORDER, body, jdPayConfig.getSecretKey(), jdPayConfig.getAccessKey());
+
+ log.info("京东退款返回数据： {}", postResult);
+
+ Map resultMap = JSONUtil.toBean(postResult, HashMap.class);
+
+ if (JdPayConstants.RESULT_SUCCESS.equals(resultMap.get("result").toString())) {
+ // 返回成功
+
+ // 返回业务数据
+ cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(resultMap.get("data"));
+
+ // 申请退款成功，保存退款
+ TOnlineRefund tOnlineRefund = new TOnlineRefund();
+ tOnlineRefund.setRefundCode(refundCode);
+ tOnlineRefund.setPkOnlinePayment(tOnlinePayment.getPkId());
+ tOnlineRefund.setBusinessCode(refundDTO.getRefundBusinessCode());
+ tOnlineRefund.setRefundMoney(amount);
+ tOnlineRefund.setRefundChannel(tOnlinePayment.getPayChannel());
+ tOnlineRefund.setRefundNumber(jsonObject.getStr("orderNum"));
+ tOnlineRefund.setPkCountry(refundDTO.getPkCountry());
+ tOnlineRefund.setPkCreator(refundDTO.getUserId());
+ if (itOnlineRefundService.save(tOnlineRefund)) {
+ return null;
+ }
+ log.error("调用京东退款入库失败， tOnlineRefund: {}", tOnlineRefund);
+ } else {
+ log.error("调用京东退款返回失败：{}", resultMap.get("errorMsg"));
+ }
+ return "退款失败，请重试";
+ } catch (Exception e) {
+ log.error("调用京东退款处理返回异常!", e);
+ return "退款异常，请重试";
+ }
+ }
+
+ @Override
+ public String jdCashRefundHandle(RefundDTO refundDTO, TOnlinePayment tOnlinePayment) {
+ try {
+ // 退款金额（默认按全款退）
+ BigDecimal amount = tOnlinePayment.getPayMoney();
+ if (null != refundDTO.getRefundAmount()) {
+ // 如果传入实际退款金额，则按实际退款金额处理
+ amount = refundDTO.getRefundAmount();
+ }
+
+ // 退款编号
+ String refundCode = CommonUtil.createSerialNumber(EOrderPrefix.REFUND_CODE);
+ // 当前时间
+ Date nowDate = new Date();
+
+ JdPayRefundRequest request = JdPayRefundRequest.builder()
+ // 退款订单号
+ .outTradeNo(refundCode)
+ // 原订单号（需要退款的订单号）
+ .originalOutTradeNo(tOnlinePayment.getBusinessCode())
+ // 退款时间
+ .tradeDate(DateUtils.parseDateToFormat(DateUtils.YAMMERERS, nowDate))
+ // 退款金额
+ .tradeAmount(amount.multiply(new BigDecimal("100")).intValue() + "")
+ // 货币种类
+ .currency("CNY")
+ // 退款回调地址
+ .notifyUrl(this.refundNotifyUrl)
+ // 回传信息
+// .returnParams("")
+ .build();
+
+ // 请求京东退款接口
+ JdPayRefundResponse response = jdPay.refund(request);
+
+ if ("0000".equals(response.getResultCode())) {
+ // 请求响应成功
+ // 申请退款成功，保存退款
+ TOnlineRefund tOnlineRefund = new TOnlineRefund();
+ tOnlineRefund.setRefundCode(refundCode);
+ tOnlineRefund.setPkOnlinePayment(tOnlinePayment.getPkId());
+ tOnlineRefund.setBusinessCode(refundDTO.getRefundBusinessCode());
+ tOnlineRefund.setRefundMoney(amount);
+ tOnlineRefund.setRefundChannel(tOnlinePayment.getPayChannel());
+ tOnlineRefund.setRefundNumber(response.getTradeNo());
+ tOnlineRefund.setPkCountry(refundDTO.getPkCountry());
+ tOnlineRefund.setPkCreator(refundDTO.getUserId());
+ if (itOnlineRefundService.save(tOnlineRefund)) {
+ return null;
+ } else {
+ log.error("调用京东收银台退款入库处理失败，desc: {}", response.getResultDesc());
+ return "退款失败，请联系系统管理员处理";
+ }
+ }
+ log.error("调用京东收银台退款处理失败，desc: {}", response.getResultDesc());
+ return "退款失败，请重试";
+ } catch (Exception e) {
+ log.error("调用京东收银台退款处理返回异常!", e);
+ return "退款异常，请重试";
+ }
+ }
}
diff --git a/bd-third/src/main/java/com/hzs/third/pay/service/impl/TOnlinePaymentSepAccDServiceImpl.java b/bd-third/src/main/java/com/hzs/third/pay/service/impl/TOnlinePaymentSepAccDServiceImpl.java
new file mode 100644
index 00000000..58929229
--- /dev/null
+++ b/bd-third/src/main/java/com/hzs/third/pay/service/impl/TOnlinePaymentSepAccDServiceImpl.java
@@ -0,0 +1,20 @@
+package com.hzs.third.pay.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hzs.common.domain.third.pay.TOnlinePaymentSepAccD;
+import com.hzs.third.pay.mapper.TOnlinePaymentSepAccDMapper;
+import com.hzs.third.pay.service.ITOnlinePaymentSepAccDService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 支付请求子表(分账) 服务实现类
+ *
+ *
+ * @author bd
+ * @since 2025-07-01
+ */
+@Service
+public class TOnlinePaymentSepAccDServiceImpl extends ServiceImpl implements ITOnlinePaymentSepAccDService {
+
+}
diff --git a/bd-third/src/main/java/com/hzs/third/pay/service/impl/TOnlinePaymentSepAccServiceImpl.java b/bd-third/src/main/java/com/hzs/third/pay/service/impl/TOnlinePaymentSepAccServiceImpl.java
new file mode 100644
index 00000000..aadf5ac3
--- /dev/null
+++ b/bd-third/src/main/java/com/hzs/third/pay/service/impl/TOnlinePaymentSepAccServiceImpl.java
@@ -0,0 +1,59 @@
+package com.hzs.third.pay.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hzs.common.core.utils.DateUtils;
+import com.hzs.common.domain.third.pay.TOnlinePaymentSepAcc;
+import com.hzs.common.domain.third.pay.TOnlinePaymentSepAccD;
+import com.hzs.common.security.utils.SecurityUtils;
+import com.hzs.third.pay.mapper.TOnlinePaymentSepAccMapper;
+import com.hzs.third.pay.service.ITOnlinePaymentSepAccDService;
+import com.hzs.third.pay.service.ITOnlinePaymentSepAccService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 支付请求主表 服务实现类
+ *
+ *
+ * @author bd
+ * @since 2025-07-01
+ */
+@Service
+public class TOnlinePaymentSepAccServiceImpl extends ServiceImpl implements ITOnlinePaymentSepAccService {
+
+ @Autowired
+ private ITOnlinePaymentSepAccDService itOnlinePaymentSepAccDService;
+ @Override
+ public void saveOrUpdateReq(TOnlinePaymentSepAcc tOnlinePaymentSepAcc) {
+ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TOnlinePaymentSepAcc::getPkPayment, tOnlinePaymentSepAcc.getPkPayment());
+ TOnlinePaymentSepAcc source = this.getOne(wrapper, false);
+ if(ObjectUtil.isNotEmpty(source)){
+ tOnlinePaymentSepAcc.setPkId(source.getPkId());
+ }else{
+ tOnlinePaymentSepAcc.setCreationTime(DateUtils.currentDateTime());
+ tOnlinePaymentSepAcc.setPkCreator(SecurityUtils.getUserId());
+ }
+ tOnlinePaymentSepAcc.setModifiedTime(DateUtils.currentDateTime());
+ tOnlinePaymentSepAcc.setPkModified(SecurityUtils.getUserId());
+ this.save(tOnlinePaymentSepAcc);
+ LambdaQueryWrapper wrapperD = new LambdaQueryWrapper<>();
+ wrapperD.eq(TOnlinePaymentSepAccD::getPkSepAcc, tOnlinePaymentSepAcc.getPkId());
+ itOnlinePaymentSepAccDService.remove(wrapperD);
+ if(CollUtil.isNotEmpty(tOnlinePaymentSepAcc.getSepAccDList())){
+ for (TOnlinePaymentSepAccD tOnlinePaymentSepAccD : tOnlinePaymentSepAcc.getSepAccDList()) {
+ tOnlinePaymentSepAccD.setPkSepAcc(tOnlinePaymentSepAcc.getPkId());
+ tOnlinePaymentSepAccD.setCreationTime(DateUtils.currentDateTime());
+ tOnlinePaymentSepAccD.setPkCreator(SecurityUtils.getUserId());
+ tOnlinePaymentSepAccD.setModifiedTime(DateUtils.currentDateTime());
+ tOnlinePaymentSepAccD.setPkModified(SecurityUtils.getUserId());
+ }
+ itOnlinePaymentSepAccDService.saveBatch(tOnlinePaymentSepAcc.getSepAccDList());
+ }
+
+ }
+}
diff --git a/bd-third/src/main/resources/bootstrap.yml b/bd-third/src/main/resources/bootstrap.yml
index cb1ee881..ad31f194 100644
--- a/bd-third/src/main/resources/bootstrap.yml
+++ b/bd-third/src/main/resources/bootstrap.yml
@@ -101,12 +101,19 @@ jd:
## 生产环境api接口域名
apiDomain: http://wapi.jd.com
## 页面回调地址
- pageBackUrl: https://t-app.beida666.com/prod-api/pay/jd/sync-notify
+# pageBackUrl: https://t-app.beida666.com/prod-api/pay/jd/sync-notify
+ pageBackUrl: https://t-app.beida666.com/#/pages/pay/index
## 支付回调地址
- notifyUrl: https://t-app.beida666.com/prod-api/pay/jd/trade-notify
+# notifyUrl: https://t-app.beida666.com/prod-api/pay/jd/trade-notify
+ notifyUrl: https://b747-218-57-66-5.ngrok-free.app/pay/jd/trade-notify
## 退款回调地下
- refundNotifyUrl: https://t-app.beida666.com/prod-api/pay/jd-refund/trade-notify
-
+# refundNotifyUrl: https://t-app.beida666.com/prod-api/pay/jd-refund/trade-notify
+ refundNotifyUrl: https://b747-218-57-66-5.ngrok-free.app/pay/jd-refund/trade-notify
+ separateAccounts:
+ - account: 153428607007
+ proportion: 0.5
+ - account: 153428607005
+ proportion: 0.5
## 通联支付配置
allinpay:
# #################### 基础支付相关（正式） ####################
diff --git a/bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentSepAccDMapper.xml b/bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentSepAccDMapper.xml
new file mode 100644
index 00000000..0eaa9269
--- /dev/null
+++ b/bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentSepAccDMapper.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DEL_FLAG,
+ CREATION_TIME,
+ MODIFIED_TIME,
+ PK_CREATOR,
+ PK_MODIFIED,
+ PK_ID, PK_SEP_ACC, ACCOUNT, PROPORTION
+
+
+
diff --git a/bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentSepAccMapper.xml b/bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentSepAccMapper.xml
new file mode 100644
index 00000000..a7a28bfe
--- /dev/null
+++ b/bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentSepAccMapper.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DEL_FLAG,
+ CREATION_TIME,
+ MODIFIED_TIME,
+ PK_CREATOR,
+ PK_MODIFIED,
+ PK_ID, PK_PAYMENT, VERSION, REQ_CONTENT, REQ_CONTENT_SEP_ACC, RESP_CONTENT
+
+
+
diff --git a/sql/2025年7月1日_京东支付_分账.sql b/sql/2025年7月1日_京东支付_分账.sql
new file mode 100644
index 00000000..9e5e94d5
--- /dev/null
+++ b/sql/2025年7月1日_京东支付_分账.sql
@@ -0,0 +1,89 @@
+CREATE TABLE "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC" (
+ "PK_ID" NUMBER(20,0),
+ "PK_PAYMENT" NUMBER(20,0),
+ "VERSION" VARCHAR2(255),
+ "REQ_CONTENT" VARCHAR2(1024),
+ "REQ_CONTENT_SEP_ACC" VARCHAR2(1024),
+ "RESP_CONTENT" VARCHAR2(2048),
+ "DEL_FLAG" NUMBER(1),
+ "PK_COUNTRY" NUMBER(4,0) DEFAULT 1 NOT NULL ENABLE,
+ "CREATION_TIME" DATE,
+ "MODIFIED_TIME" DATE,
+ "PK_CREATOR" NUMBER(20,0),
+ "PK_MODIFIED" NUMBER(20,0),
+ PRIMARY KEY ("PK_ID")
+)
+;
+
+COMMENT ON COLUMN "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC"."PK_PAYMENT" IS '在线支付信息ID';
+
+COMMENT ON COLUMN "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC"."VERSION" IS '版本号';
+
+COMMENT ON COLUMN "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC"."REQ_CONTENT" IS '支付请求信息';
+
+COMMENT ON COLUMN "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC"."REQ_CONTENT_SEP_ACC" IS '分账请求信息';
+
+COMMENT ON COLUMN "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC"."RESP_CONTENT" IS '支付响应信息';
+
+COMMENT ON COLUMN "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC"."DEL_FLAG" IS '逻辑删除 (0=未删除,1已删除)';
+
+COMMENT ON COLUMN "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC"."CREATION_TIME" IS '创建时间';
+
+COMMENT ON COLUMN "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC"."MODIFIED_TIME" IS '修改时间';
+
+COMMENT ON COLUMN "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC"."PK_CREATOR" IS '创建者';
+
+COMMENT ON COLUMN "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC"."PK_MODIFIED" IS '更新者';
+
+COMMENT ON TABLE "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC" IS '支付请求主表';
+
+CREATE SEQUENCE T_ONLINE_PAYMENT_SEP_ACC_SEQ
+ START WITH 1
+ INCREMENT BY 1;
+
+CREATE TABLE "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC_D" (
+ "PK_ID" NUMBER(20,0),
+ "PK_SEP_ACC" NUMBER(20,0),
+ "ACCOUNT" VARCHAR2(255),
+ "PROPORTION" NUMBER(10, 2),
+ "DEL_FLAG" NUMBER(1),
+ "PK_COUNTRY" NUMBER(4,0) DEFAULT 1 NOT NULL ENABLE,
+ "CREATION_TIME" DATE,
+ "MODIFIED_TIME" DATE,
+ "PK_CREATOR" NUMBER(20,0),
+ "PK_MODIFIED" NUMBER(20,0),
+ PRIMARY KEY ("PK_ID")
+)
+;
+
+COMMENT ON COLUMN "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC_D"."PK_SEP_ACC" IS '支付请求主表ID';
+
+COMMENT ON COLUMN "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC_D"."ACCOUNT" IS '分账账号';
+
+COMMENT ON COLUMN "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC_D"."PROPORTION" IS '分账比例';
+
+COMMENT ON COLUMN "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC_D"."DEL_FLAG" IS '逻辑删除 (0=未删除,1已删除)';
+
+COMMENT ON COLUMN "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC_D"."CREATION_TIME" IS '创建时间';
+
+COMMENT ON COLUMN "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC_D"."MODIFIED_TIME" IS '修改时间';
+
+COMMENT ON COLUMN "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC_D"."PK_CREATOR" IS '创建者';
+
+COMMENT ON COLUMN "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC_D"."PK_MODIFIED" IS '更新者';
+
+COMMENT ON TABLE "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC_D" IS '支付请求子表(分账)';
+
+CREATE SEQUENCE T_ONLINE_PAYMENT_SEP_ACC_D_SEQ
+ START WITH 1
+ INCREMENT BY 1;
+
+
+ALTER TABLE "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC"
+ ADD ("TRADE_AMOUNT" NUMBER(16,2));
+COMMENT ON COLUMN "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC"."TRADE_AMOUNT" IS '总金额';
+
+
+ALTER TABLE "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC_D"
+ ADD ("TRADE_AMOUNT" NUMBER(16,2));
+COMMENT ON COLUMN "CLOUD_2"."T_ONLINE_PAYMENT_SEP_ACC_D"."TRADE_AMOUNT" IS '分账金额';
diff --git a/文档/支付/支付回调/京东 b/文档/支付/支付回调/京东
new file mode 100644
index 00000000..8598f156
--- /dev/null
+++ b/文档/支付/支付回调/京东
@@ -0,0 +1,5 @@
+正常支付回调:
+ {"signData":"CFC402DAEBC319048859760C3C1076E252A0AA8E06480D33ABE8E9E4F6F64942","charset":"UTF-8","encType":"AP7","code":"00000","signType":"SHA-256","respData":"eyJiYW5rQ29kZSI6IkNDQiIsInRyYWRlTm8iOiIyMDI1MDcwMTE0MDI0MzIwMTE4MzAyNzYyOTk0MTkiLCJyZXN1bHRDb2RlIjoiMDAwMCIsImNhcmRUeXBlIjoiREUiLCJtYXNrQ2FyZE5vIjoiMDMwNSIsInJlc3VsdERlc2MiOiLmiJDlip8iLCJiYW5rU3VibWl0Tm8iOiIwNzAxNjU5MDI3NDk2MTUzIiwidXNlcklkIjoiVF8xMDkiLCJleHRJbmZvIjoie30iLCJwYXlUb29sIjoiRVhQUiIsInRyYWRlQW1vdW50IjoiMiIsInJldHVyblBhcmFtcyI6IjEiLCJvdXRUcmFkZU5vIjoiQkRTTzE3NTEzNDk3NTE0MDk2MDgiLCJ0cmFkZVN0YXR1cyI6IkZJTkkiLCJmaW5pc2hEYXRlIjoiMjAyNTA3MDExNDAzMTciLCJjdXJyZW5jeSI6IkNOWSIsInRyYWRlVHlwZSI6IkFHR1JFIn0=","formatType":"JSON","desc":"成功","merchantNo":"153428607005"}
+退款回调: 入口(my-order/self-revoke-order)
+
+