From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java | 81 ++++------------------------------------
1 files changed, 9 insertions(+), 72 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java
index 0af1e43..726963f 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java
@@ -2,21 +2,15 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.redis.service.RedisService;
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.DelayTaskEnum;
-import com.ruoyi.system.api.constant.SecurityConstant;
import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
-import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.model.LoginUser;
-import com.ruoyi.system.api.service.RemoteConfigService;
import com.ruoyi.system.api.service.RemoteMemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -47,11 +41,6 @@
@Resource
private OrderService orderService;
- @Resource
- private RedisService redisService;
-
- @Resource
- private RemoteConfigService remoteConfigService;
@RequestMapping(value = "/buyGoods", method = RequestMethod.POST)
@@ -92,24 +81,6 @@
Long userId = loginUser.getUserid();
appPlaceOrderDto.setUserId(userId);
appPlaceOrderDto.setSpbillCreateIp(loginUser.getIpaddr());
-
- if (userId != null) {
- Member member = memberService.getMember(userId).getData();
- appPlaceOrderDto.setUserId(userId);
-
- if (member != null) {
- appPlaceOrderDto.setOpenid(member.getMiniOpenid());
- appPlaceOrderDto.setShopId(member.getRelationShopId());
- if (member.getBindingFlag() != 1) {
- //绑定商户
- AppMemberBindingDto appMemberBindingDto = new AppMemberBindingDto();
- appMemberBindingDto.setShopId(appPlaceOrderDto.getShopId());
- appMemberBindingDto.setUserId(userId);
- appMemberBindingDto.setBindingFlag(1);
- memberService.updateMemberBinding(appMemberBindingDto);
- }
- }
- }
AppPlaceOrderVo appPlaceOrderVo = orderService.placeOrder(appPlaceOrderDto);
return R.ok(appPlaceOrderVo);
}
@@ -117,22 +88,10 @@
@RequestMapping(value = "/placeActivityOrder", method = RequestMethod.POST)
@ApiOperation(value = "创建活动订单")
public R<AppPlaceOrderVo> placeActivityOrder(@Validated @RequestBody AppPlaceActivityDto appPlaceActivityDto) {
- Long userId = SecurityUtils.getUserId();
- if (userId != null) {
- Member member = memberService.getMember(userId).getData();
- appPlaceActivityDto.setUserId(userId);
- if (member != null && member.getRelationShopId() != null) {
- appPlaceActivityDto.setShopId(member.getRelationShopId());
- }
- if (member.getBindingFlag() != 1) {
- //绑定商户
- AppMemberBindingDto appMemberBindingDto = new AppMemberBindingDto();
- appMemberBindingDto.setShopId(appPlaceActivityDto.getShopId());
- appMemberBindingDto.setUserId(userId);
- appMemberBindingDto.setBindingFlag(1);
- memberService.updateMemberBinding(appMemberBindingDto);
- }
- }
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ Long userId = loginUser.getUserid();
+ appPlaceActivityDto.setUserId(userId);
+ appPlaceActivityDto.setSpbillCreateIp(loginUser.getIpaddr());
AppPlaceOrderVo appPlaceOrderVo = orderService.placeActivityOrder(appPlaceActivityDto);
return R.ok(appPlaceOrderVo);
}
@@ -141,14 +100,7 @@
@ApiOperation(value = "分页获取用户订单")
public R<Page<AppUserOrderPageVo>> pageUserOrder(@RequestBody AppUserOrderPageDto appUserOrderPageDto) {
Long userId = SecurityUtils.getUserId();
- if (userId != null) {
- Member member = memberService.getMember(userId).getData();
- appUserOrderPageDto.setUserId(userId);
- if (member != null && member.getRelationShopId() != null) {
- appUserOrderPageDto.setShopId(member.getRelationShopId());
- }
- }
- logger.info("appUserOrderPageDto:" + appUserOrderPageDto.toString());
+ appUserOrderPageDto.setUserId(userId);
Page<AppUserOrderPageVo> page = new Page<>();
page.setSize(appUserOrderPageDto.getPageSize());
page.setCurrent(appUserOrderPageDto.getPageNum());
@@ -178,25 +130,10 @@
}
@RequestMapping(value = "/payOrder", method = RequestMethod.POST)
- @ApiOperation(value = "支付订单(临时)")
- public R<AppPlaceOrderVo> placeOrder(@RequestBody AppBaseGetDto appBaseGetDto) {
+ @ApiOperation(value = "支付订单")
+ public R<AppPlaceOrderVo> payOrder(@RequestBody AppBaseGetDto appBaseGetDto) {
Long userId = SecurityUtils.getUserId();
- AppPlaceOrderVo appPlaceOrderVo = new AppPlaceOrderVo();
- Order order = orderService.getById(appBaseGetDto.getId());
- order.setOrderStatus(2);
- orderService.saveOrUpdate(order);
- appPlaceOrderVo.setOrderId(order.getOrderId());
- appPlaceOrderVo.setOrderNo(order.getOrderNo());
- appPlaceOrderVo.setPayType(order.getPayType());
- appPlaceOrderVo.setPayMoney(order.getPayMoney());
- appPlaceOrderVo.setUnpaidMoney(order.getPayMoney());
- Integer delayTime = 30;
- if (redisService.hasKey(SecurityConstant.AUTO_CANCEL_ORDER_TIME)) {
- delayTime = redisService.getCacheObject(SecurityConstant.AUTO_CANCEL_ORDER_TIME);
- }
- redisService.deleteObject(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode() + "-" + order.getOrderId());
- remoteConfigService.deleteDelayTask(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode() + "-" + order.getOrderId());
- appPlaceOrderVo.setEndTime(DateUtils.addMinutes(order.getCreateTime(), delayTime));
+ AppPlaceOrderVo appPlaceOrderVo = orderService.payOrder(appBaseGetDto.getId());
return R.ok(appPlaceOrderVo);
}
--
Gitblit v1.7.1