From c4b2a916399eee796bbf93d24bf41fd18c4d9f44 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 七月 2025 09:10:11 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java | 95 ++++++++++++++++++++++++++++++-----------------
1 files changed, 61 insertions(+), 34 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 1482c1c..7fb8691 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
@@ -9,12 +9,12 @@
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.constant.AppErrorConstant;
+import com.ruoyi.system.api.domain.poji.goods.Goods;
+import com.ruoyi.system.api.model.AddOrderVo;
+import com.ruoyi.system.api.service.RemoteGoodsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Date;
@@ -35,6 +35,9 @@
@Resource
private OrderService orderService;
+ @Resource
+ private RemoteGoodsService remoteGoodsService;
+
@RequestMapping(value = "/verifyCode", method = RequestMethod.POST)
@ApiOperation(value = "核销code")
@@ -42,28 +45,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,16 +92,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());
- }
- }
+ MerVerifyOrderVo merVerifyOrderVo = orderService.verifyOrder(verifyCode, merVerifyCodeDto.getShopId());
return R.ok(merVerifyOrderVo);
}
@@ -99,6 +109,10 @@
//抖音
if (merVerifyOrderDto.getOrderId().contains("douyin")) {
merVerifyOrderVo = orderService.sureVerifyOrderDouYin(merVerifyOrderDto);
+ }
+ //快手
+ if (merVerifyOrderDto.getOrderId().contains("ksurl")) {
+ merVerifyOrderVo = orderService.sureVerifyOrderKuaiShou(merVerifyOrderDto);
}
}
return R.ok(merVerifyOrderVo);
@@ -224,4 +238,17 @@
return R.ok(page.setRecords(merOrderPageVoList));
}
-}
+
+ /**
+ * 抽奖的平台商品生成订单--待审核
+ * @param orderVo
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "/addOrder", method = RequestMethod.POST)
+ public R addOrder(@RequestBody AddOrderVo orderVo){
+ Goods goods = remoteGoodsService.getGoods(orderVo.getGoodsId()).getData();
+ orderService.addOrder(orderVo.getShopId(), orderVo.getUserId(), goods, orderVo.getGoodsNum(), orderVo.getId(), 2);
+ return R.ok();
+ }
+}
\ No newline at end of file
--
Gitblit v1.7.1