From c642ca1d5aad271b22155fce6bd553533343501c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 24 七月 2025 09:10:10 +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 | 69 ++++++++++++++++++----------------
1 files changed, 36 insertions(+), 33 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 dec5930..97b9812 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
@@ -42,28 +42,44 @@
Long userId = SecurityUtils.getUserId();
merVerifyCodeDto.setUserId(userId);
String verifyCode = merVerifyCodeDto.getVerifyCode();
- String[] verifyCodeArr = verifyCode.split("-");
MerVerifyCodeVo merVerifyCodeVo = new MerVerifyCodeVo();
- Integer type = Integer.valueOf(verifyCodeArr[0]);
- verifyCode = verifyCodeArr[1];
- merVerifyCodeVo.setVerifyType(type);
- switch(type){
- case 1:
- MerVerifyOrderVo merVerifyOrderVo = orderService.verifyOrder(verifyCode,merVerifyCodeDto.getShopId());
+ if(!verifyCode.contains("https")){
+ String[] verifyCodeArr = verifyCode.split("-");
+ Integer type = Integer.valueOf(verifyCodeArr[0]);
+ verifyCode = verifyCodeArr[1];
+ merVerifyCodeVo.setVerifyType(type);
+ switch(type){
+ case 1:
+ MerVerifyOrderVo merVerifyOrderVo = orderService.verifyOrder(verifyCode,merVerifyCodeDto.getShopId());
+ merVerifyCodeVo.setMerVerifyOrderVo(merVerifyOrderVo);
+ break;
+ case 2:
+ MerVerifyCouponVo merVerifyCouponVo = orderService.verifyCoupon(verifyCode,merVerifyCodeDto.getShopId());
+ merVerifyCouponVo.setCouponId(merVerifyCouponVo.getMemberCouponId().toString());
+ merVerifyCodeVo.setMerVerifyCouponVo(merVerifyCouponVo);
+ break;
+ case 3:
+ MerVerifyAwardVo merVerifyAwardVo = orderService.verifyPrize(verifyCode,merVerifyCodeDto.getShopId());
+ merVerifyCodeVo.setMerVerifyAwardVo(merVerifyAwardVo);
+ break;
+ default:
+ throw new ServiceException(AppErrorConstant.VERIFY_TYPE_MISS);
+ }
+ }else{
+ merVerifyCodeVo.setVerifyType(1);
+ //三方订单
+ //抖音
+ if (verifyCode.contains("douyin")) {
+ MerVerifyOrderVo merVerifyOrderVo = orderService.verifyOrderDouYin(verifyCode, merVerifyCodeDto.getShopId());
merVerifyCodeVo.setMerVerifyOrderVo(merVerifyOrderVo);
- break;
- case 2:
- MerVerifyCouponVo merVerifyCouponVo = orderService.verifyCoupon(verifyCode,merVerifyCodeDto.getShopId());
- merVerifyCouponVo.setCouponId(merVerifyCouponVo.getMemberCouponId().toString());
- merVerifyCodeVo.setMerVerifyCouponVo(merVerifyCouponVo);
- break;
- case 3:
- MerVerifyAwardVo merVerifyAwardVo = orderService.verifyPrize(verifyCode,merVerifyCodeDto.getShopId());
- merVerifyCodeVo.setMerVerifyAwardVo(merVerifyAwardVo);
- break;
- default:
- throw new ServiceException(AppErrorConstant.VERIFY_TYPE_MISS);
+ }
+ //快手
+ if (verifyCode.contains("ksurl")) {
+ MerVerifyOrderVo merVerifyOrderVo = orderService.verifyOrderKuaiShou(verifyCode, merVerifyCodeDto.getShopId());
+ merVerifyCodeVo.setMerVerifyOrderVo(merVerifyOrderVo);
+ }
}
+
return R.ok(merVerifyCodeVo);
}
@@ -73,20 +89,7 @@
Long userId = SecurityUtils.getUserId();
merVerifyCodeDto.setUserId(userId);
String verifyCode = merVerifyCodeDto.getVerifyCode();
- MerVerifyOrderVo merVerifyOrderVo = null;
- if (!verifyCode.contains("https")) {
- merVerifyOrderVo = orderService.verifyOrder(verifyCode, merVerifyCodeDto.getShopId());
- } else {
- //三方订单
- //抖音
- if (verifyCode.contains("douyin")) {
- merVerifyOrderVo = orderService.verifyOrderDouYin(verifyCode, merVerifyCodeDto.getShopId());
- }
- //快手
- if (verifyCode.contains("ksurl")) {
- merVerifyOrderVo = orderService.verifyOrderKuaiShou(verifyCode, merVerifyCodeDto.getShopId());
- }
- }
+ MerVerifyOrderVo merVerifyOrderVo = orderService.verifyOrder(verifyCode, merVerifyCodeDto.getShopId());
return R.ok(merVerifyOrderVo);
}
--
Gitblit v1.7.1