From 1a1e608f143bd49a000dbd0192ce9fd6c04feb6f Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 24 七月 2025 09:21:17 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 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 35368b8..dec5930 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
@@ -82,6 +82,10 @@
if (verifyCode.contains("douyin")) {
merVerifyOrderVo = orderService.verifyOrderDouYin(verifyCode, merVerifyCodeDto.getShopId());
}
+ //快手
+ if (verifyCode.contains("ksurl")) {
+ merVerifyOrderVo = orderService.verifyOrderKuaiShou(verifyCode, merVerifyCodeDto.getShopId());
+ }
}
return R.ok(merVerifyOrderVo);
}
@@ -99,6 +103,10 @@
//抖音
if (merVerifyOrderDto.getOrderId().contains("douyin")) {
merVerifyOrderVo = orderService.sureVerifyOrderDouYin(merVerifyOrderDto);
+ }
+ //快手
+ if (merVerifyOrderDto.getOrderId().contains("ksurl")) {
+ merVerifyOrderVo = orderService.sureVerifyOrderKuaiShou(merVerifyOrderDto);
}
}
return R.ok(merVerifyOrderVo);
@@ -184,6 +192,7 @@
return R.fail("取消失败");
}
order.setOrderStatus(0);
+ order.setCancelType(2);
order.setCancelTime(new Date());
orderService.updateById(order);
return R.ok();
--
Gitblit v1.7.1