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 | 109 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 83 insertions(+), 26 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 bb77b82..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
@@ -5,6 +5,7 @@
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.domain.dto.*;
+import com.ruoyi.order.domain.pojo.order.Order;
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.constant.AppErrorConstant;
@@ -16,6 +17,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.Date;
import java.util.List;
/**
@@ -40,27 +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());
- 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);
}
@@ -70,7 +89,7 @@
Long userId = SecurityUtils.getUserId();
merVerifyCodeDto.setUserId(userId);
String verifyCode = merVerifyCodeDto.getVerifyCode();
- MerVerifyOrderVo merVerifyOrderVo = orderService.verifyOrder(verifyCode,merVerifyCodeDto.getShopId());
+ MerVerifyOrderVo merVerifyOrderVo = orderService.verifyOrder(verifyCode, merVerifyCodeDto.getShopId());
return R.ok(merVerifyOrderVo);
}
@@ -79,7 +98,20 @@
public R<MerVerifyOrderVo> sureVerifyOrder(@RequestBody MerVerifyOrderDto merVerifyOrderDto) {
Long userId = SecurityUtils.getUserId();
merVerifyOrderDto.setUserId(userId);
- MerVerifyOrderVo merVerifyOrderVo = orderService.sureVerifyOrder(merVerifyOrderDto);
+ MerVerifyOrderVo merVerifyOrderVo = null;
+ if (!merVerifyOrderDto.getOrderId().contains("https")) {
+ merVerifyOrderVo = orderService.sureVerifyOrder(merVerifyOrderDto);
+ } else {
+ //三方订单
+ //抖音
+ if (merVerifyOrderDto.getOrderId().contains("douyin")) {
+ merVerifyOrderVo = orderService.sureVerifyOrderDouYin(merVerifyOrderDto);
+ }
+ //快手
+ if (merVerifyOrderDto.getOrderId().contains("ksurl")) {
+ merVerifyOrderVo = orderService.sureVerifyOrderKuaiShou(merVerifyOrderDto);
+ }
+ }
return R.ok(merVerifyOrderVo);
}
@@ -132,19 +164,44 @@
orderService.createNewOrder(merNewOrderDto);
return R.ok();
}
-
+
@RequestMapping(value = "/pageMerOrder", method = RequestMethod.POST)
- @ApiOperation(value = "获取商户端订单列表")
+ @ApiOperation(value = "获取商户端订单列表【2.0】")
public R<Page<MerOrderPageVo>> pageMerOrder(@RequestBody MerOrderPageDto merOrderPageDto) {
Long userId = SecurityUtils.getUserId();
merOrderPageDto.setUserId(userId);
Page<MerOrderPageVo> page = new Page<>();
page.setSize(merOrderPageDto.getPageSize());
page.setCurrent(merOrderPageDto.getPageNum());
- List<MerOrderPageVo> merOrderPageVoList = orderService.pageMerOrder(page,merOrderPageDto);
+ List<MerOrderPageVo> merOrderPageVoList = orderService.pageMerOrder(page, merOrderPageDto);
return R.ok(page.setRecords(merOrderPageVoList));
}
-
+
+
+ @RequestMapping(value = "/cancelMerOrder", method = RequestMethod.POST)
+ @ApiOperation(value = "商户端取消线下订单【2.0】")
+ public R cancelMerOrder(@RequestBody CancelMerOrderDto dto) {
+ Order order = orderService.getById(dto.getOrderId());
+ if (null == order) {
+ return R.fail("订单不存在");
+ }
+ if (order.getOrderStatus() == 0) {
+ return R.fail("订单已取消");
+ }
+ if (!order.getShopId().equals(dto.getShopId())) {
+ return R.fail("取消失败");
+ }
+ if (3 != order.getOrderFrom()) {
+ return R.fail("取消失败");
+ }
+ order.setOrderStatus(0);
+ order.setCancelType(2);
+ order.setCancelTime(new Date());
+ orderService.updateById(order);
+ return R.ok();
+ }
+
+
@RequestMapping(value = "/totalMerOrder", method = RequestMethod.POST)
@ApiOperation(value = "商户端订单管理统计")
public R<MerTotalOrderVo> totalMerOrder(@RequestBody MerOrderPageDto merOrderPageDto) {
@@ -153,9 +210,9 @@
MerTotalOrderVo totalOrderVo = orderService.totalMerOrder(merOrderPageDto);
return R.ok(totalOrderVo);
}
-
+
@RequestMapping(value = "/pageMerMemberOrder", method = RequestMethod.POST)
- @ApiOperation(value = "分页商户端用户收银记录")
+ @ApiOperation(value = "分页商户端用户收银记录【2.0】")
public R<Page<MerMemberOrderVo>> pageMerMemberOrder(@RequestBody MerMemberNoClearOrderDto merMemberNoClearOrderDto) {
Long userId = SecurityUtils.getUserId();
merMemberNoClearOrderDto.setUserId(userId);
--
Gitblit v1.7.1