From cfd0118ef446a66f91999afc7b1e46ca607adf50 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 13 七月 2023 20:32:35 +0800
Subject: [PATCH] 定时任务 统计
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java | 144 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 135 insertions(+), 9 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 2d03e87..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
@@ -1,21 +1,26 @@
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.web.controller.BaseController;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.order.domain.dto.AppBuyGoodsDto;
-import com.ruoyi.order.domain.dto.AppSureOrderDto;
-import com.ruoyi.order.domain.vo.AppSureOrderVo;
+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.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;
/**
* @author jqs34
@@ -29,10 +34,10 @@
@RequestMapping("/app/order")
public class AppOrderController extends BaseController {
- @Autowired
+ @Resource
private RemoteMemberService memberService;
- @Autowired
+ @Resource
private OrderService orderService;
@@ -43,13 +48,134 @@
if(userId!=null){
Member member = memberService.getMember(userId).getData();
appSureOrderDto.setUserId(userId);
- if(member!=null&&member.getRealtionShopId()!=null){
- appSureOrderDto.setShopId(member.getRealtionShopId());
+ if(member!=null&&member.getRelationShopId()!=null){
+ appSureOrderDto.setShopId(member.getRelationShopId());
}
}
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)
+ @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);
+ }
+ }
+ AppPlaceOrderVo appPlaceOrderVo = orderService.placeOrder(appPlaceOrderDto);
+ 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) {
+ 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());
+ Page<AppUserOrderPageVo> page = new Page<>();
+ page.setSize(appUserOrderPageDto.getPageSize());
+ page.setCurrent(appUserOrderPageDto.getPageNum());
+ List<AppUserOrderPageVo> appUserOrderPageVoList = orderService.pageUserOrder(page,appUserOrderPageDto);
+ return R.ok(page.setRecords(appUserOrderPageVoList));
+ }
+
+ @RequestMapping(value = "/getAppOrderDetail", method = RequestMethod.POST)
+ @ApiOperation(value = "获取订单详情")
+ public R<AppUserOrderGetVo> getAppOrderDetail(@RequestBody AppBaseGetDto appBaseGetDto) {
+ Long userId = SecurityUtils.getUserId();
+ Long shopId = null;
+ if(userId!=null){
+ Member member = memberService.getMember(userId).getData();
+ appBaseGetDto.setUserId(userId);
+ if(member!=null&&member.getRelationShopId()!=null){
+ shopId = member.getRelationShopId();
+ }
+ }
+ AppUserOrderGetVo appUserOrderGetVo = orderService.getAppOrderDetail(appBaseGetDto);
+ if(shopId!=null&&appUserOrderGetVo.getShopId().equals(shopId)){
+ appUserOrderGetVo.setSameShop(1);
+ }else{
+ appUserOrderGetVo.setSameShop(0);
+ }
+ return R.ok(appUserOrderGetVo);
+ }
+
+ @RequestMapping(value = "/payOrder", method = RequestMethod.POST)
+ @ApiOperation(value = "支付订单(临时)")
+ public R<AppPlaceOrderVo> placeOrder(@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()));
+ return R.ok(appPlaceOrderVo);
+ }
+
+ @RequestMapping(value = "/cancelOrder", method = RequestMethod.POST)
+ @ApiOperation(value = "取消订单")
+ public R cancelOrder(@RequestBody AppBaseGetDto appBaseGetDto) {
+ Long userId = SecurityUtils.getUserId();
+ orderService.cancelOrder(appBaseGetDto.getId());
+ return R.ok();
+ }
}
--
Gitblit v1.7.1