From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 一月 2025 16:40:43 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java | 104 +++++++++++++++++++++++++++++++---------------------
1 files changed, 62 insertions(+), 42 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 f569556..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
@@ -1,12 +1,27 @@
package com.ruoyi.order.controller.miniapp;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.order.domain.dto.*;
+import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.OrderService;
+import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
+import com.ruoyi.system.api.domain.poji.member.Member;
+import com.ruoyi.system.api.model.LoginUser;
+import com.ruoyi.system.api.service.RemoteMemberService;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+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 javax.annotation.Resource;
+import java.util.List;
/**
* @author jqs34
@@ -20,20 +35,22 @@
@RequestMapping("/app/order")
public class AppOrderController extends BaseController {
-
+ @Resource
+ private RemoteMemberService memberService;
@Resource
private OrderService orderService;
- /*@RequestMapping(value = "/buyGoods", method = RequestMethod.POST)
+
+ @RequestMapping(value = "/buyGoods", method = RequestMethod.POST)
@ApiOperation(value = "购买商品")
public R<AppSureOrderVo> buyGoods(@RequestBody AppSureOrderDto appSureOrderDto) {
Long userId = SecurityUtils.getUserId();
- if(userId!=null){
+ if (userId != null) {
Member member = memberService.getMember(userId).getData();
appSureOrderDto.setUserId(userId);
- if(member!=null&&member.getRelationShopId()!=null){
+ if (member != null && member.getRelationShopId() != null) {
appSureOrderDto.setShopId(member.getRelationShopId());
}
}
@@ -41,26 +58,41 @@
return R.ok(appSureOrderVo);
}
+
+ @RequestMapping(value = "/panicBuyGoods", method = RequestMethod.POST)
+ @ApiOperation(value = "抢购商品")
+ public R<AppPanicBuyVo> panicBuyGoods(@RequestBody AppPanicBuyDto appPanicBuyDto) {
+ Long userId = SecurityUtils.getUserId();
+ if (userId != null) {
+ Member member = memberService.getMember(userId).getData();
+ appPanicBuyDto.setUserId(userId);
+ if (member != null && member.getRelationShopId() != null) {
+ appPanicBuyDto.setShopId(member.getRelationShopId());
+ }
+ }
+ AppPanicBuyVo panicBuyGoods = orderService.panicBuyGoods(appPanicBuyDto);
+ return R.ok(panicBuyGoods);
+ }
+
@RequestMapping(value = "/placeOrder", method = RequestMethod.POST)
@ApiOperation(value = "创建订单")
public R<AppPlaceOrderVo> placeOrder(@RequestBody AppPlaceOrderDto appPlaceOrderDto) {
- Long userId = SecurityUtils.getUserId();
- if(userId!=null){
- Member member = memberService.getMember(userId).getData();
- appPlaceOrderDto.setUserId(userId);
- if(member!=null&&member.getRelationShopId()!=null){
- 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);
- }
- }
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ Long userId = loginUser.getUserid();
+ appPlaceOrderDto.setUserId(userId);
+ appPlaceOrderDto.setSpbillCreateIp(loginUser.getIpaddr());
AppPlaceOrderVo appPlaceOrderVo = orderService.placeOrder(appPlaceOrderDto);
+ return R.ok(appPlaceOrderVo);
+ }
+
+ @RequestMapping(value = "/placeActivityOrder", method = RequestMethod.POST)
+ @ApiOperation(value = "创建活动订单")
+ public R<AppPlaceOrderVo> placeActivityOrder(@Validated @RequestBody AppPlaceActivityDto appPlaceActivityDto) {
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ Long userId = loginUser.getUserid();
+ appPlaceActivityDto.setUserId(userId);
+ appPlaceActivityDto.setSpbillCreateIp(loginUser.getIpaddr());
+ AppPlaceOrderVo appPlaceOrderVo = orderService.placeActivityOrder(appPlaceActivityDto);
return R.ok(appPlaceOrderVo);
}
@@ -68,18 +100,11 @@
@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());
- List<AppUserOrderPageVo> appUserOrderPageVoList = orderService.pageUserOrder(page,appUserOrderPageDto);
+ List<AppUserOrderPageVo> appUserOrderPageVoList = orderService.pageUserOrder(page, appUserOrderPageDto);
return R.ok(page.setRecords(appUserOrderPageVoList));
}
@@ -88,32 +113,27 @@
public R<AppUserOrderGetVo> getAppOrderDetail(@RequestBody AppBaseGetDto appBaseGetDto) {
Long userId = SecurityUtils.getUserId();
Long shopId = null;
- if(userId!=null){
+ if (userId != null) {
Member member = memberService.getMember(userId).getData();
appBaseGetDto.setUserId(userId);
- if(member!=null&&member.getRelationShopId()!=null){
+ if (member != null && member.getRelationShopId() != null) {
shopId = member.getRelationShopId();
}
}
AppUserOrderGetVo appUserOrderGetVo = orderService.getAppOrderDetail(appBaseGetDto);
- if(shopId!=null&&appUserOrderGetVo.getShopId().equals(shopId)){
+ if (shopId != null && appUserOrderGetVo.getShopId().equals(shopId)) {
appUserOrderGetVo.setSameShop(1);
- }else{
+ } else {
appUserOrderGetVo.setSameShop(0);
}
return R.ok(appUserOrderGetVo);
}
@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());
- appPlaceOrderVo.setOrderId(order.getOrderId());
- appPlaceOrderVo.setOrderNo(order.getOrderNo());
- appPlaceOrderVo.setPayMoney(order.getPayMoney());
- appPlaceOrderVo.setUnpaidMoney(order.getReceivableMoney().subtract(order.getPayMoney()));
+ AppPlaceOrderVo appPlaceOrderVo = orderService.payOrder(appBaseGetDto.getId());
return R.ok(appPlaceOrderVo);
}
@@ -123,6 +143,6 @@
Long userId = SecurityUtils.getUserId();
orderService.cancelOrder(appBaseGetDto.getId());
return R.ok();
- }*/
+ }
}
--
Gitblit v1.7.1