From 53eece6b5c6845fd70155a101b2a9e567b59a421 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期日, 10 八月 2025 20:01:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 95 +++++++++++++++++++++++++++++++----------------
1 files changed, 62 insertions(+), 33 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 9666f04..e069801 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,35 +1,33 @@
package com.ruoyi.order.controller;
-import com.alibaba.fastjson2.JSON;
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.AppUser;
-import com.ruoyi.common.core.constant.ExpressCompanyMap;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.WebUtils;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
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.dto.ConfirmOrderDTO;
-
import com.ruoyi.order.enums.OrderStatus;
+import com.ruoyi.order.export.ChargeOrderExport;
import com.ruoyi.order.mapper.OrderMapper;
import com.ruoyi.order.model.ChargeOrder;
import com.ruoyi.order.model.Order;
import com.ruoyi.order.service.ChargeOrderService;
import com.ruoyi.order.service.OrderService;
-import com.ruoyi.order.util.payment.model.RefundCallbackResult;
-import com.ruoyi.order.util.payment.model.UniPayCallbackResult;
import com.ruoyi.order.util.payment.wechat.PayMoneyUtil;
import com.ruoyi.order.util.payment.wx.WechatPayService;
import com.ruoyi.order.util.payment.wx.vo.PayResult;
-import com.ruoyi.order.util.vo.MapTrackKD100Vo;
import com.ruoyi.order.util.vo.ShopAnalysisVO;
import com.ruoyi.order.vo.*;
import com.ruoyi.other.api.domain.BaseSetting;
@@ -37,29 +35,28 @@
import com.ruoyi.other.api.dto.ShopAnalysisDTO;
import com.ruoyi.other.api.feignClient.BaseSettingClient;
import com.ruoyi.other.api.feignClient.ShopClient;
-import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
-import io.swagger.annotations.*;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.Duration;
+import java.net.URLEncoder;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -100,7 +97,7 @@
@ResponseBody
@PostMapping("/confirmOrder")
- @ApiOperation(value = "确定订单", tags = {"商城-订单-小程序"})
+ @ApiOperation(value = "确定订单", tags = {"商城-订单-小程序-确定订单"})
public R<ConfirmOrderVo> confirmOrder(@RequestBody ConfirmOrderDTO confirmOrderDTO) {
ConfirmOrderVo confirmOrderVo = orderService.confirmOrder(confirmOrderDTO.getGoodId(),confirmOrderDTO.getType());
return R.ok(confirmOrderVo);
@@ -108,7 +105,7 @@
@ResponseBody
@PostMapping("/orderPayment")
- @ApiOperation(value = "订单支付", tags = {"商城-订单支付-小程序"})
+ @ApiOperation(value = "订单支付", tags = {"商城-订单支付-小程序-订单支付"})
public R orderPayment(@RequestBody OrderPayment orderPayment){
return orderService.orderPayment(orderPayment);
}
@@ -147,12 +144,12 @@
/**
* 我的订单列表
*/
- @ApiOperation(value = "我的订单列表", tags = {"小程序-个人中心-我的订单"})
+ @ApiOperation(value = "我的订单列表", tags = {"小程序-个人中心-我的订单-我的订单列表"})
@ApiImplicitParams({
@ApiImplicitParam(value = "订单状态", name = "status", required = true, dataType = "int"),
})
@GetMapping("/getMyOrderList")
- public TableDataInfo<OrderVO> getMyOrderList(@RequestParam("订单状态") Integer status) {
+ public TableDataInfo<OrderVO> getMyOrderList(@RequestParam("status") Integer status) {
startPage();
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
return getDataTable(orderService.selectOrderListByUserId(status, loginUserApplet.getUserid()));
@@ -181,7 +178,7 @@
/**
* 扫码校验
*/
- @ApiOperation(value = "扫码校验", tags = {"小程序-个人中心-门店管理"})
+ @ApiOperation(value = "扫码校验", tags = {"小程序-个人中心-门店管理-扫码校验"})
@GetMapping("/check/{orderNumber}/{shopId}")
public R<Boolean> check(@PathVariable("orderNumber") String orderNumber, @PathVariable("shopId") Integer shopId) {
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
@@ -193,7 +190,7 @@
/**
* 订单核销
*/
- @ApiOperation(value = "订单核销", tags = {"小程序-个人中心-门店管理"})
+ @ApiOperation(value = "订单核销", tags = {"小程序-个人中心-门店管理-订单核销"})
@GetMapping("/writeOff")
public R<Void> writeOff(@RequestParam("id") String id, @RequestParam("shopId") Integer shopId) {
orderService.writeOff(id, shopId);
@@ -201,7 +198,7 @@
}
@GetMapping("/getShopOrderList")
- @ApiOperation(value = "获取订单列表", tags = {"门店后台-订单管理", })
+ @ApiOperation(value = "获取订单列表", tags = {"门店后台-订单管理-获取订单列表"})
public R<IPage<OrderPageListVo>> getShopOrderList(@RequestParam("content") String content ,
@RequestParam("status") Integer status,
@RequestParam("shopId") Integer shopId,
@@ -210,7 +207,7 @@
return R.ok(orderService.getShopOrderList(content,status,shopId,pageNum,pageSize));
}
@PostMapping("/importExpress")
- @ApiOperation(value = "2.0新增导入订单", tags = {"门店后台-订单管理"})
+ @ApiOperation(value = "2.0新增导入订单", tags = {"门店后台-订单管理-2.0新增导入订单"})
public R importExpress(@RequestParam("file") MultipartFile file) {
/* JSONObject jsonObject = JSONObject.parseObject(url);
String url2 = jsonObject.getString("url");*/
@@ -221,8 +218,35 @@
return orderService.importExpress(file);
}
+ @ApiOperation(value = "2.0订单导入模板下载", tags = {"门店后台-订单管理-2.0订单导入模板下载"})
+ @GetMapping("/importOrder")
+ public void importOrder() {
+ List<OrderExport> orderExports = new ArrayList<>();
+ Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), OrderExport.class, orderExports);
+ HttpServletResponse response = WebUtils.response();
+ ServletOutputStream outputStream = null;
+ try {
+ String fileName = URLEncoder.encode("订单导入模板.xls", "utf-8");
+ response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+ response.setHeader("content-Type", "application/vnd.ms-excel");
+ response.setHeader("Pragma", "no-cache");
+ response.setHeader("Cache-Control", "no-cache");
+ outputStream = response.getOutputStream();
+ workbook.write(outputStream);
+ } catch (IOException e) {
+ e.printStackTrace();
+ System.out.println("订单导入模板下载失败!");
+ } finally {
+ try {
+ outputStream.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
@PutMapping("/shopCancelOrder/{orderId}")
- @ApiOperation(value = "取消订单", tags = {"门店后台-订单管理"})
+ @ApiOperation(value = "取消订单", tags = {"门店后台-订单管理-取消订单"})
public R shopCancelOrder(@PathVariable("orderId") Long orderId) {
return orderService.shopCancelOrder(orderId);
}
@@ -232,7 +256,7 @@
/**
* 取消订单
*/
- @ApiOperation(value = "取消订单", tags = {"小程序-个人中心-我的订单"})
+ @ApiOperation(value = "取消订单小程序", tags = {"小程序-个人中心-我的订单-取消订单小程序"})
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
})
@@ -244,7 +268,7 @@
/**
* 确认收货
*/
- @ApiOperation(value = "确认收货", tags = {"小程序-个人中心-我的订单"})
+ @ApiOperation(value = "确认收货", tags = {"小程序-个人中心-我的订单-确认收货"})
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
})
@@ -272,7 +296,7 @@
/**
* 更新订单状态
*/
- @ApiOperation(value = "更新订单状态", tags = {"后台-订单管理"})
+ @ApiOperation(value = "更新订单状态", tags = {"后台-订单管理-更新订单状态"})
@ApiImplicitParams({
@ApiImplicitParam(value = "订单对象", name = "order", required = true, dataType = "Order"),
})
@@ -327,20 +351,20 @@
@PutMapping("/cancelOrder/{orderId}")
- @ApiOperation(value = "取消订单操作", tags = {"后台-订单管理"})
+ @ApiOperation(value = "取消订单操作", tags = {"后台-订单管理-取消订单操作"})
public R cancelOrder(@PathVariable("orderId") Long orderId) {
return orderService.cancelOrder(orderId);
}
@PutMapping("/receivingOperation/{orderId}")
- @ApiOperation(value = "收货操作", tags = {"管理后台-订单管理"})
+ @ApiOperation(value = "收货操作", tags = {"管理后台-订单管理-收货操作"})
public R receivingOperation(@PathVariable("orderId") Long orderId) {
return orderService.receivingOperation(orderId);
}
@GetMapping("/getOrderInfo/{orderId}")
- @ApiOperation(value = "查询订单详情", tags = {"管理后台-订单管理"})
+ @ApiOperation(value = "查询订单详情", tags = {"管理后台-订单管理-查询订单详情"})
public R<OrderInfoVo> getOrderInfo(@PathVariable("orderId") Long orderId) {
OrderInfoVo orderInfo = orderService.getOrderInfo(orderId);
return R.ok(orderInfo);
@@ -348,8 +372,14 @@
@GetMapping("/getOrderPageList")
- @ApiOperation(value = "获取订单列表", tags = {"后台-订单管理", })
+// @ApiOperation(value = "获取订单列表后台", tags = {"管理后台-订单管理-获取订单列表后台"})
public R<PageInfo<OrderManagePageListVO>> getOrderPageList(OrderPageList orderPageList) {
+ return R.ok(orderService.getOrderPageList(orderPageList));
+ }
+
+ @PostMapping("/queryOrderPageList")
+ @ApiOperation(value = "获取订单列表后台", tags = {"管理后台-订单管理-获取订单列表后台"})
+ public R<PageInfo<OrderManagePageListVO>> queryOrderPageList(@RequestBody OrderPageList orderPageList) {
return R.ok(orderService.getOrderPageList(orderPageList));
}
@@ -357,7 +387,7 @@
* 订单统计
*/
/* @GetMapping("/getOrderStatistics")
- @ApiOperation(value = "订单统计", tags = {"管理后台-首页统计"})
+ //@ApiOperation(value = "订单统计", tags = {"管理后台-首页统计"})
public R<OrderStatistics> getOrderStatistics(@RequestParam("startTime") String startTime,
@RequestParam("endTime") String endTime) {
@@ -454,7 +484,6 @@
/**
* 获取商品销售数量
*
- * @param goodsId
* @return
*/
@PostMapping(value = "/getList")
@@ -527,7 +556,7 @@
* @return
*//*
@GetMapping("/getOrderExpress/{id}")
- @ApiOperation(value = "获取订单快递明细", tags = {"小程序-订单管理"})
+ //@ApiOperation(value = "获取订单快递明细", tags = {"小程序-订单管理"})
public R<MapTrackKD100Vo> getOrderExpress(@PathVariable("id") Long id) {
Order order = orderService.getById(id);
String expressResult = order.getExpressResult();
--
Gitblit v1.7.1