From 5627daeb1ac1a29947e902f9a7efb6730ed98611 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 07 七月 2023 20:35:50 +0800
Subject: [PATCH] 管理台bug和用户端生日卡
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 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 b9dea8f..27aa8ac 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
@@ -8,18 +8,18 @@
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.RemoteMemberService;
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.service.RemoteMemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
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;
/**
@@ -34,10 +34,10 @@
@RequestMapping("/app/order")
public class AppOrderController extends BaseController {
- @Autowired
+ @Resource
private RemoteMemberService memberService;
- @Autowired
+ @Resource
private OrderService orderService;
@@ -54,6 +54,21 @@
}
AppSureOrderVo appSureOrderVo = orderService.buyGoods(appSureOrderDto);
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)
@@ -79,6 +94,29 @@
return R.ok(appPlaceOrderVo);
}
+ @RequestMapping(value = "/placeActivityOrder", method = RequestMethod.POST)
+ @ApiOperation(value = "创建活动订单")
+ public R<AppPlaceOrderVo> placeActivityOrder(@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);
+ }
+ }
+ AppPlaceOrderVo appPlaceOrderVo = orderService.placeActivityOrder(appPlaceActivityDto);
+ return R.ok(appPlaceOrderVo);
+ }
+
@RequestMapping(value = "/pageUserOrder", method = RequestMethod.POST)
@ApiOperation(value = "分页获取用户订单")
public R<Page<AppUserOrderPageVo>> pageUserOrder(@RequestBody AppUserOrderPageDto appUserOrderPageDto) {
--
Gitblit v1.7.1