From af6456c60aa0d3cc931d3c85f652fa7e47d003e3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 23 六月 2025 11:11:02 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
index b4c22d6..35368b8 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
@@ -74,10 +74,14 @@
merVerifyCodeDto.setUserId(userId);
String verifyCode = merVerifyCodeDto.getVerifyCode();
MerVerifyOrderVo merVerifyOrderVo = null;
- if (!verifyCode.contains("http")) {
+ if (!verifyCode.contains("https")) {
merVerifyOrderVo = orderService.verifyOrder(verifyCode, merVerifyCodeDto.getShopId());
} else {
//三方订单
+ //抖音
+ if (verifyCode.contains("douyin")) {
+ merVerifyOrderVo = orderService.verifyOrderDouYin(verifyCode, merVerifyCodeDto.getShopId());
+ }
}
return R.ok(merVerifyOrderVo);
}
@@ -88,10 +92,14 @@
Long userId = SecurityUtils.getUserId();
merVerifyOrderDto.setUserId(userId);
MerVerifyOrderVo merVerifyOrderVo = null;
- if (!merVerifyOrderDto.getOrderId().contains("http")) {
+ if (!merVerifyOrderDto.getOrderId().contains("https")) {
merVerifyOrderVo = orderService.sureVerifyOrder(merVerifyOrderDto);
} else {
//三方订单
+ //抖音
+ if (merVerifyOrderDto.getOrderId().contains("douyin")) {
+ merVerifyOrderVo = orderService.sureVerifyOrderDouYin(merVerifyOrderDto);
+ }
}
return R.ok(merVerifyOrderVo);
}
--
Gitblit v1.7.1