From b22df417e0bc423c788b013feaad686531d69eed Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 08 一月 2025 09:51:37 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 209 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 193 insertions(+), 16 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 05397e6..dfd365b 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,23 +8,33 @@
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.util.payment.model.RefundCallbackResult;
+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.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotBlank;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
-import java.util.List;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -48,6 +58,8 @@
private CommissionService commissionService;
@Resource
private BaseSettingClient baseSettingClient;
+ @Resource
+ private OrderMapper orderMapper;
/**
@@ -120,11 +132,8 @@
@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();
+ public R cancel(@PathVariable("orderId") Long orderId){
+ return orderService.cancel(orderId);
}
/**
@@ -136,13 +145,6 @@
})
@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("售后设置获取失败");
@@ -154,7 +156,11 @@
String content = baseSetting.getContent();
JSONObject jsonObject = JSONObject.parseObject(content);
Long days = jsonObject.getLong("days");
- commissionService.addToCommissionDelayQueue(orderId, LocalDateTime.now().plusDays(days));
+ Order order = orderService.getById(orderId);
+ order.setAfterSaleTime(LocalDateTime.now().plusDays(days));
+ order.setIsCommission(0);
+ order.setOrderStatus(OrderStatus.COMPLETED.getCode());
+ orderService.updateById(order);
return R.ok();
}
@@ -213,5 +219,176 @@
}
+ @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).list());
+ }
+
+
+
+
+
+
+ @PostMapping("/confirmDelivery")
+ @ApiOperation(value = "已发货操作", tags = {"管理后台-订单管理"})
+ public R confirmDelivery(@RequestBody ConfirmDelivery confirmDelivery){
+ return orderService.confirmDelivery(confirmDelivery.getOrderId(), confirmDelivery.getCode());
+ }
+
+
+ @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){
+
+ List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>()
+ .between(Order::getCreateTime, LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
+
+
+ Map<String, List<Order>> map = orderList.stream().collect(Collectors.groupingBy(item -> item.getCreateTime()
+ .format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))));
+
+ List<OrderStatisticsDetail> orderStatisticsDetails = new ArrayList<>();
+ map.forEach((key, value) -> {
+ int serviceTotal = 0;
+ int singleTotal = 0;
+ int total = 0;
+ BigDecimal totalMoney = BigDecimal.ZERO;
+ BigDecimal serviceTotalMoney = BigDecimal.ZERO;
+ BigDecimal singleTotalMoney = BigDecimal.ZERO;
+ OrderStatisticsDetail orderStatisticsDetail = new OrderStatisticsDetail();
+ for (Order order : value) {
+ if (order.getOrderType().equals(1)) {
+ serviceTotal++;
+ serviceTotalMoney = serviceTotalMoney.add(order.getPaymentAmount());
+ }else if (order.getOrderType().equals(2)){
+ singleTotal++;
+ singleTotalMoney = singleTotalMoney.add(order.getPaymentAmount());
+ }
+ total++;
+ totalMoney = totalMoney.add(order.getPaymentAmount());
+ }
+ orderStatisticsDetail.setDate(key);
+ orderStatisticsDetail.setServiceTotal(serviceTotal);
+ orderStatisticsDetail.setSingleTotal(singleTotal);
+ orderStatisticsDetail.setTotal(total);
+ orderStatisticsDetails.add(orderStatisticsDetail);
+ });
+ OrderStatistics orderStatistics = orderMapper.getOrderStatistics(startTime, endTime);
+ if(null != orderStatistics){
+ orderStatistics.setOrderStatisticsDetailList(orderStatisticsDetails);
+ }
+ return R.ok(orderStatistics);
+ }
+
+
+ /**
+ * 订单取消支付回退
+ * @param refundCallbackResult
+ * @param response
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("/refundPayMoneyCallback")
+ public void refundPayMoneyCallback(RefundCallbackResult refundCallbackResult, HttpServletResponse response){
+ R callback = orderService.refundPayMoneyCallback(refundCallbackResult);
+ if(callback.getCode() == 200){
+ response.setStatus(200);
+ PrintWriter out = null;
+ try {
+ out = response.getWriter();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ out.println("success");
+ out.flush();
+ out.close();
+ }
+ }
+
+
+ /**
+ * 取消订单快递费回退
+ * @param refundCallbackResult
+ * @param response
+ */
+ @ResponseBody
+ @GetMapping("/refundExpressPayMoneyCallback")
+ public void refundExpressPayMoneyCallback(RefundCallbackResult refundCallbackResult, HttpServletResponse response){
+ R callback = orderService.refundExpressPayMoneyCallback(refundCallbackResult);
+ if(callback.getCode() == 200){
+ response.setStatus(200);
+ PrintWriter out = null;
+ try {
+ out = response.getWriter();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ out.println("success");
+ out.flush();
+ out.close();
+ }
+ }
+
+
+ /**
+ * 获取商品销售数量
+ * @param goodsId
+ * @return
+ */
+ @PostMapping("/getGoodsSaleNum")
+ public R<Integer> getGoodsSaleNum(@RequestParam("goodsId") Integer goodsId, @RequestParam("type") Integer type){
+ Integer goodsSaleNum = orderService.getGoodsSaleNum(goodsId, type);
+ return R.ok(goodsSaleNum);
+ }
+
+
+
+ /**
+ * 获取门店销售订单数量
+ * @param shopId 门店id
+ * @param type 1：服务订单，2：单品订单
+ * @return
+ */
+ @PostMapping("/getShopSaleNum")
+ public R<Integer> getShopSaleNum(@RequestParam("shopId") Integer shopId, @RequestParam("type") Integer type){
+ Integer shopSaleNum = orderService.getShopSaleNum(shopId, type);
+ return R.ok(shopSaleNum);
+ }
+
}
--
Gitblit v1.7.1