From 3bba8ccaea4c0ff7ad5a7acb056d554c42b2eca2 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 03 五月 2023 17:10:43 +0800
Subject: [PATCH] 小程序初步完成

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java |   82 ++++++++++++++++++++++++++++++++++++++--
 1 files changed, 77 insertions(+), 5 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..9d0e97a 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,13 +1,14 @@
 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.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.poji.member.Member;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -16,6 +17,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
 
 /**
  * @author jqs34
@@ -43,13 +46,82 @@
         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 = "/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());
+            }
+        }
+        AppPlaceOrderVo appPlaceOrderVo = orderService.placeOrder(appPlaceOrderDto);
+        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());
+            }
+        }
+        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 = null;
+        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