From a8d2cb07f6440dc54dc4005b0b06d5a47cb1517d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 16 十二月 2024 13:34:03 +0800
Subject: [PATCH] 12.16
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 199 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 179 insertions(+), 20 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index 1d3b5e8..05397e6 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -1,18 +1,30 @@
package com.ruoyi.order.controller;
-import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.ruoyi.account.api.feignClient.UserAddressClient;
+import com.ruoyi.account.api.model.UserAddress;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.order.enums.OrderStatus;
+import com.ruoyi.order.model.Order;
+import com.ruoyi.order.service.CommissionService;
import com.ruoyi.order.service.OrderService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.order.vo.OrderDetailVO;
+import com.ruoyi.order.vo.OrderVO;
+import com.ruoyi.other.api.domain.BaseSetting;
+import com.ruoyi.other.api.feignClient.BaseSettingClient;
+import com.ruoyi.system.api.model.LoginUser;
+import io.swagger.annotations.*;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -22,37 +34,184 @@
* @author luodangjia
* @since 2024-11-21
*/
-@Api("订单")
+@Api(tags = "订单")
@RestController
@RequestMapping("/order")
-public class OrderController {
+public class OrderController extends BaseController {
@Resource
private OrderService orderService;
+ @Resource
+ private TokenService tokenService;
+ @Resource
+ private UserAddressClient addressClient;
+ @Resource
+ private CommissionService commissionService;
+ @Resource
+ private BaseSettingClient baseSettingClient;
/**
- * 扫码校验
+ * 我的订单列表
*/
- @ApiOperation(value = "扫码校验", tags = {"订单核销"})
+ @ApiOperation(value = "我的订单列表", tags = {"小程序-个人中心-我的订单"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "分享id", name = "shareId", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单状态", name = "status", required = true, dataType = "int"),
})
- @GetMapping("/check/{orderId}/{shopId}")
- public AjaxResult check(@PathVariable("orderId") Integer orderId, @PathVariable("shopId") Integer shopId){
- return AjaxResult.success(orderService.check(orderId, shopId));
+ @GetMapping("/getMyOrderList")
+ public TableDataInfo<OrderVO> getMyOrderList(@ApiParam("订单状态") Integer status){
+ startPage();
+ LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+ return getDataTable(orderService.selectOrderListByUserId(status, loginUserApplet.getUserid()));
+ }
+
+ /**
+ * 通过订单ids获取订单列表
+ */
+ @PostMapping("/getOrderListByIds")
+ public R<List<Order>> getOrderListByIds(@RequestBody List<Long> ids){
+ return R.ok(orderService.listByIds(ids));
}
/**
* 订单详情
*/
- @ApiOperation(value = "订单详情", tags = {"订单详情"})
+ @ApiOperation(value = "订单详情", tags = {"小程序-个人中心-我的订单-订单详情"})
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
})
@GetMapping("/detail/{orderId}")
- public AjaxResult detail(@PathVariable("orderId") Integer orderId){
- return AjaxResult.success(orderService.getById(orderId));
+ public R<OrderDetailVO> detail(@PathVariable("orderId") Long orderId){
+ return R.ok(orderService.getOrderDetail(orderId));
}
+ /**
+ * 扫码校验
+ */
+ @ApiOperation(value = "扫码校验", tags = {"小程序-个人中心-门店管理"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "分享id", name = "shareId", required = true, dataType = "int", paramType="query"),
+ })
+ @GetMapping("/check/{orderNumber}/{shopId}")
+ public R<Boolean> check(@PathVariable("orderNumber") String orderNumber, @PathVariable("shopId") Integer shopId){
+ LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+ Order order = orderService.getOne(new LambdaQueryWrapper<Order>()
+ .eq(Order::getOrderNumber, orderNumber));
+ return R.ok(orderService.check(order, shopId, loginUserApplet.getUserid()));
+ }
+
+ /**
+ * 订单核销
+ */
+ @ApiOperation(value = "订单核销", tags = {"小程序-个人中心-门店管理"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "订单号", name = "code", required = true, dataType = "String"),
+ })
+ @GetMapping("/writeOff/{code}/{shopId}")
+ public R<Void> writeOff(@PathVariable("code") String code, @PathVariable("shopId") Integer shopId){
+ orderService.writeOff(code, shopId);
+ return R.ok();
+ }
+
+ /**
+ * 取消订单
+ */
+ @ApiOperation(value = "取消订单", tags = {"小程序-个人中心-我的订单"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
+ })
+ @GetMapping("/cancel/{orderId}")
+ public R<Void> cancel(@PathVariable("orderId") Long orderId){
+ orderService.update(new LambdaUpdateWrapper<Order>()
+ .eq(Order::getId, orderId)
+ .set(Order::getOrderStatus, OrderStatus.CANCELLED.getCode()));
+ return R.ok();
+ }
+
+ /**
+ * 确认收货
+ */
+ @ApiOperation(value = "确认收货", tags = {"小程序-个人中心-我的订单"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
+ })
+ @GetMapping("/confirm/{orderId}")
+ public R<Void> confirm(@PathVariable("orderId") Long orderId){
+ boolean update = orderService.update(new LambdaUpdateWrapper<Order>()
+ .eq(Order::getId, orderId)
+ .eq(Order::getOrderStatus, OrderStatus.PENDING_RECEIPT.getCode())
+ .set(Order::getOrderStatus, OrderStatus.COMPLETED.getCode()));
+ if(!update){
+ return R.fail("订单状态异常");
+ }
+ R<BaseSetting> baseSettingR = baseSettingClient.getBaseSetting(5);
+ if (R.isError(baseSettingR)) {
+ return R.fail("售后设置获取失败");
+ }
+ BaseSetting baseSetting = baseSettingR.getData();
+ if (baseSetting == null) {
+ return R.fail("售后设置获取失败");
+ }
+ String content = baseSetting.getContent();
+ JSONObject jsonObject = JSONObject.parseObject(content);
+ Long days = jsonObject.getLong("days");
+ commissionService.addToCommissionDelayQueue(orderId, LocalDateTime.now().plusDays(days));
+ return R.ok();
+ }
+
+ /**
+ * 更换收货地址
+ */
+ @ApiOperation(value = "更换收货地址", tags = {"小程序-个人中心-我的订单"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
+ })
+ @GetMapping("/changeAddress")
+ public R<Void> changeAddress(@RequestParam("orderId") Long orderId, @RequestParam("addressId") Long addressId){
+ R<UserAddress> userAddressR = addressClient.getUserAddressById(addressId);
+ if(R.isError(userAddressR)){
+ return R.fail("收货地址不存在");
+ }
+ UserAddress userAddress = userAddressR.getData();
+ String addressJson = JSONObject.toJSONString(userAddress);
+ orderService.update(new LambdaUpdateWrapper<Order>()
+ .eq(Order::getId, orderId)
+ .set(Order::getAddressJson, addressJson));
+ return R.ok();
+ }
+
+ /**
+ * 更新订单状态
+ */
+ @ApiOperation(value = "更新订单状态", tags = {"后台-订单管理"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "订单对象", name = "order", required = true, dataType = "Order"),
+ })
+ @PostMapping("/updateOrderStatus")
+ public R<Void> updateOrderStatus(@RequestBody Order order){
+ Order order1 = orderService.getById(order.getId());
+ order1.setOrderStatus(order.getOrderStatus());
+ orderService.updateById(order1);
+ return R.ok();
+ }
+
+
+ /**
+ * 预约技师
+ */
+ @PostMapping("/subscribe")
+ public R<Void> subscribe(@RequestParam(value = "id", required = false) Long id ,@RequestParam(value = "technicianId", required = false) Integer technicianId){
+ Order order = orderService.getById(id);
+ order.setTechnicianId(technicianId);
+ orderService.updateById(order);
+ return R.ok();
+ }
+
+ @PostMapping("/getLastOrder")
+ public R<Order> getLastOrder(@RequestParam("appUserId") Long appUserId){
+ Order one = orderService.lambdaQuery().eq(Order::getAppUserId, appUserId).orderByDesc(Order::getCreateTime).last("limit 1").one();
+ return R.ok(one);
+ }
+
+
}
--
Gitblit v1.7.1