From 905077448a20fe1f06c9303152e83a6c9463541c Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 10 四月 2025 19:21:54 +0800
Subject: [PATCH] 商家端
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 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 92d476e..59a0cec 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
@@ -4,6 +4,7 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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;
@@ -167,10 +168,28 @@
@ApiImplicitParam(value = "订单id", name = "id", required = true, dataType = "String"),
})
@GetMapping("/writeOff")
- public R<Void> writeOff(String code, Integer shopId, String technicianId) {
- orderService.writeOff(code, shopId, technicianId);
+ public R<Void> writeOff(String code, Integer shopId) {
+ orderService.writeOff(code, shopId);
return R.ok();
}
+
+ @GetMapping("/getShopOrderList")
+ @ApiOperation(value = "获取订单列表", tags = {"门店后台-订单管理", })
+ public R<IPage<OrderPageListVo>> getShopOrderList(@ApiParam("模糊查询：订单编号/商品名/手机号 ") String content ,
+ @ApiParam("订单状态") Integer status,
+ @ApiParam("门店id") Integer shopId,
+ @ApiParam("页码") @RequestParam("pageNum") Integer pageNum,
+ @ApiParam("每一页数据大小") @RequestParam("pageSize") Integer pageSize) {
+ return R.ok(orderService.getShopOrderList(content,status,shopId,pageNum,pageSize));
+ }
+
+ @PutMapping("/shopCancelOrder/{orderId}")
+ @ApiOperation(value = "取消订单", tags = {"门店后台-订单管理"})
+ public R shopCancelOrder(@PathVariable("orderId") Long orderId) {
+ return orderService.shopCancelOrder(orderId);
+ }
+
+
/**
* 取消订单
@@ -291,7 +310,7 @@
@GetMapping("/getOrderPageList")
-// @ApiOperation(value = "获取订单列表", tags = {"管理后台-订单管理", "门店后台-订单管理"})
+ @ApiOperation(value = "获取订单列表", tags = {"管理后台-订单管理", })
public R<PageInfo<OrderPageListVo>> getOrderPageList(OrderPageList orderPageList) {
return R.ok(orderService.getOrderPageList(orderPageList));
}
@@ -570,8 +589,8 @@
if (StringUtils.isNotEmpty(goodJson) && !"NULL".equals(goodJson)) {
Goods goods = JSONObject.parseObject(goodJson, Goods.class);
orderExport.setGoodsName(goods.getName());
- orderExport.setCompanyCostPrice(goods.getOperatingCost());
- orderExport.setSupplierCostPrice(goods.getShopCost());
+ /* orderExport.setCompanyCostPrice(goods.getOperatingCost());
+ orderExport.setSupplierCostPrice(goods.getShopCost());*/
}
String expressJson = orderExport.getExpressJson();
--
Gitblit v1.7.1