From ec09e9f2c72ff37654076c327008ac89ed32a8c3 Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期六, 24 六月 2023 17:44:11 +0800
Subject: [PATCH] 导入导出

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java |  107 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 90 insertions(+), 17 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..f569556 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,12 @@
 package com.ruoyi.order.controller.miniapp;
 
-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.service.order.OrderService;
-import com.ruoyi.system.api.RemoteMemberService;
-import com.ruoyi.system.api.domain.poji.member.Member;
 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;
 
 /**
  * @author jqs34
@@ -29,27 +20,109 @@
 @RequestMapping("/app/order")
 public class AppOrderController extends BaseController {
 
-    @Autowired
-    private RemoteMemberService memberService;
 
-    @Autowired
+
+    @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){
             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());
+            }
+            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 = "/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