From 60f70f7409ec1ece8905e088fb43e0cb0258a70b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 19 十二月 2024 10:10:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 106 insertions(+), 12 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 3a63281..fa009b9 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
@@ -8,18 +8,25 @@
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.PageInfo;
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.mapper.OrderMapper;
import com.ruoyi.order.model.Order;
+import com.ruoyi.order.service.CommissionService;
import com.ruoyi.order.service.OrderService;
-import com.ruoyi.order.vo.OrderDetailVO;
-import com.ruoyi.order.vo.OrderVO;
+import com.ruoyi.order.vo.*;
+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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.validation.constraints.NotBlank;
+import java.time.LocalDateTime;
import java.util.List;
/**
@@ -40,6 +47,12 @@
private TokenService tokenService;
@Resource
private UserAddressClient addressClient;
+ @Resource
+ private CommissionService commissionService;
+ @Resource
+ private BaseSettingClient baseSettingClient;
+ @Resource
+ private OrderMapper orderMapper;
/**
@@ -67,7 +80,7 @@
/**
* 订单详情
*/
- @ApiOperation(value = "订单详情", tags = {"小程序-订单详情"})
+ @ApiOperation(value = "订单详情", tags = {"小程序-个人中心-我的订单-订单详情"})
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
})
@@ -79,7 +92,7 @@
/**
* 扫码校验
*/
- @ApiOperation(value = "扫码校验", tags = {"小程序-个人中心-门店管理-扫码核销校验"})
+ @ApiOperation(value = "扫码校验", tags = {"小程序-个人中心-门店管理"})
@ApiImplicitParams({
@ApiImplicitParam(value = "分享id", name = "shareId", required = true, dataType = "int", paramType="query"),
})
@@ -94,7 +107,7 @@
/**
* 订单核销
*/
- @ApiOperation(value = "订单核销", tags = {"小程序-个人中心-门店管理-扫码核销"})
+ @ApiOperation(value = "订单核销", tags = {"小程序-个人中心-门店管理"})
@ApiImplicitParams({
@ApiImplicitParam(value = "订单号", name = "code", required = true, dataType = "String"),
})
@@ -107,7 +120,7 @@
/**
* 取消订单
*/
- @ApiOperation(value = "取消订单", tags = {"小程序-个人中心-我的订单-取消订单"})
+ @ApiOperation(value = "取消订单", tags = {"小程序-个人中心-我的订单"})
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
})
@@ -122,22 +135,38 @@
/**
* 确认收货
*/
- @ApiOperation(value = "确认收货", tags = {"小程序-个人中心-我的订单-确认收货"})
+ @ApiOperation(value = "确认收货", tags = {"小程序-个人中心-我的订单"})
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
})
@GetMapping("/confirm/{orderId}")
public R<Void> confirm(@PathVariable("orderId") Long orderId){
- Order order = orderService.getById(orderId);
- order.setOrderStatus(OrderStatus.COMPLETED.getCode());
- orderService.updateById(order);
+ 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 = {"小程序-个人中心-我的订单-更换收货地址"})
+ @ApiOperation(value = "更换收货地址", tags = {"小程序-个人中心-我的订单"})
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
})
@@ -158,7 +187,7 @@
/**
* 更新订单状态
*/
- @ApiOperation(value = "更新订单状态", tags = {"后台-订单管理-更新订单状态"})
+ @ApiOperation(value = "更新订单状态", tags = {"后台-订单管理"})
@ApiImplicitParams({
@ApiImplicitParam(value = "订单对象", name = "order", required = true, dataType = "Order"),
})
@@ -182,6 +211,71 @@
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);
+ }
+
+
+ @PostMapping("/byUserId")
+ public R<List<Order>> byUserId(@RequestParam("appUserId") Long appUserId){
+ return R.ok(orderService.lambdaQuery().eq(Order::getAppUserId, appUserId).list());
+ }
+ @PostMapping("/byShopId")
+ public R<List<Order>> byShopId(@RequestParam("shopId") Integer shopId){
+ return R.ok(orderService.lambdaQuery().isNotNull(Order::getEndTime).eq(Order::getShopId, shopId).groupBy(Order::getAppUserId).list());
+ }
+
+
+
+
+
+
+ @PutMapping("/confirmDelivery/{orderId}")
+ @ApiOperation(value = "已发货操作", tags = {"管理后台-订单管理"})
+ public R confirmDelivery(@PathVariable("orderId") String orderId, String code){
+ return orderService.confirmDelivery(orderId, code);
+ }
+
+
+ @PutMapping("/cancelOrder/{orderId}")
+ @ApiOperation(value = "取消订单操作", tags = {"管理后台-订单管理"})
+ public R cancelOrder(@PathVariable("orderId") Long orderId){
+ return orderService.cancelOrder(orderId);
+ }
+
+ @PutMapping("/receivingOperation/{orderId}")
+ @ApiOperation(value = "收货操作", tags = {"管理后台-订单管理"})
+ public R receivingOperation(@PathVariable("orderId") Long orderId){
+ return orderService.receivingOperation(orderId);
+ }
+
+
+ @GetMapping("/getOrderInfo/{orderId}")
+ @ApiOperation(value = "查询订单详情", tags = {"管理后台-订单管理"})
+ public R<OrderInfoVo> getOrderInfo(@PathVariable("orderId") Long orderId){
+ OrderInfoVo orderInfo = orderService.getOrderInfo(orderId);
+ return R.ok(orderInfo);
+ }
+
+
+ @GetMapping("/getOrderPageList")
+// @ApiOperation(value = "获取订单列表", tags = {"管理后台-订单管理", "门店后台-订单管理"})
+ public R<PageInfo<OrderPageListVo>> getOrderPageList(OrderPageList orderPageList){
+ return R.ok(orderService.getOrderPageList(orderPageList));
+ }
+
+ /**
+ * 订单统计
+ */
+ @GetMapping("/getOrderStatistics")
+ @ApiOperation(value = "订单统计", tags = {"管理后台-首页统计"})
+ public R<OrderStatistics> getOrderStatistics(@RequestParam("startTime") String startTime,
+ @RequestParam("endTime") String endTime){
+ OrderStatistics orderStatistics = orderMapper.getOrderStatistics(LocalDateTime.parse(startTime), LocalDateTime.parse(endTime));
+ return R.ok(orderStatistics);
+ }
}
--
Gitblit v1.7.1