From 2e3f5dfec643f2b2b91bf70e68dd882a1a32140c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 九月 2025 10:24:36 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml | 1 +
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtThirdOrderPageVo.java | 4 ++++
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 9 +++++++++
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderDetailVo.java | 4 ++++
4 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderDetailVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderDetailVo.java
index 64b2c55..bb2bc91 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderDetailVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderDetailVo.java
@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.ruoyi.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -44,6 +45,9 @@
@ApiModelProperty(value="订单编号")
private String orderNo;
+ @ApiModelProperty(value="第三方订单号")
+ private String tripartiteOrderId;
+
@ApiModelProperty(value="支付流水号")
private String outTradeNo;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtThirdOrderPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtThirdOrderPageVo.java
index f5ca6a3..a13a48d 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtThirdOrderPageVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtThirdOrderPageVo.java
@@ -16,6 +16,10 @@
@ApiModelProperty(value="订单编号")
private String orderNo;
+ @Excel(name = "第三方订单号", width = 30, sort = 1)
+ @ApiModelProperty(value="第三方订单号")
+ private String tripartiteOrderId;
+
@Excel(name = "订单来源", width = 30, sort = 1)
@ApiModelProperty(value="订单来源")
private String orderFrom;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index 64e3635..92ef12c 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -1926,6 +1926,10 @@
@Override
public MerVerifyOrderVo verifyOrderDouYin(String orderId, Long shopId) {
+ Shop shop = remoteShopService.getShop(shopId).getData();
+ if(StringUtils.isEmpty(shop.getDyPoiId())){
+ throw new ServiceException("请先绑定抖音门店ID");
+ }
CertificatePrepareResponseData data = VerifyUtil.certificatePrepare(orderId);
if (null == data) {
throw new ServiceException("查询券信息失败");
@@ -1964,6 +1968,10 @@
@Override
public MerVerifyOrderVo verifyOrderKuaiShou(String orderId, Long shopId) {
+ Shop shop = remoteShopService.getShop(shopId).getData();
+ if(StringUtils.isEmpty(shop.getKsPoiId())){
+ throw new ServiceException("请先绑定快手门店ID");
+ }
VerifyPrepareDataNew data = KSVerifyUtil.certificatePrepare(redisService, orderId);
if (null == data) {
throw new ServiceException("查询券信息失败");
@@ -4285,6 +4293,7 @@
}
// 设置订单编号
mgtOrderDetailVo.setOrderNo(order.getOrderNo());
+ mgtOrderDetailVo.setTripartiteOrderId(order.getTripartiteOrderId());
mgtOrderDetailVo.setOutTradeNo(order.getOutTradeNo());
// 设置订单来源
switch (order.getOrderFrom()) {
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
index 4cb92de..3a306cf 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -2334,6 +2334,7 @@
<select id="pageMgtThirdOrder" resultType="com.ruoyi.order.domain.vo.MgtThirdOrderPageVo">
SELECT
toc.order_no orderNo,
+ toc.tripartite_order_id tripartiteOrderId,
CASE toc.order_from
WHEN 5 THEN '美团'
WHEN 6 THEN '抖音'
--
Gitblit v1.7.1