From 33884a1e6e3126983ae944fff749fe6f9271c404 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 10 十一月 2025 17:34:49 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OrderPakoutController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 56 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
index 7cecfc3..ddd7ac5 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
@@ -9,6 +9,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderDomainParam;
+import com.zy.asrs.entity.result.OrderPakoutMainVo;
import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
@@ -243,7 +244,7 @@
}
@RequestMapping(value = "/order/delete/auth")
- @ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
+ @ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁″垝缁勮揣鍗�")
@Transactional
public R delete(@RequestParam Long orderId){
orderService.remove(orderId);
@@ -255,6 +256,14 @@
// throw new CoolException("鍒犻櫎璁㈠崟澶辫触");
// }
// orderDetlService.modifyStatus(orderId, 0);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/order/abandoned/auth")
+ @ManagerAuth(memo = "鎵嬪姩搴熷純璁″垝缁勮揣鍗�")
+ @Transactional
+ public R abandoned(@RequestParam Long orderId){
+ orderService.updateSettle(orderId,99L,getUserId());
return R.ok();
}
@@ -295,4 +304,50 @@
return R.ok();
}
+ @RequestMapping(value = "/order/cargo/grouping/auth/v1")
+ @ManagerAuth
+ public R orderCargoGrouping(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+
+ try{
+ String itemName = null;
+ String cstmrName = null;
+ Integer settle = null;
+ Integer status = null;
+ Date modiTimeStart = null, modiTimeEnd = null;
+ for (Map.Entry<String, Object> entry : param.entrySet()) {
+ String val = String.valueOf(entry.getValue());
+ if (Cools.isEmpty(val)) {
+ continue;
+ }
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ modiTimeStart = DateUtils.convert(dates[0]);
+ modiTimeEnd = DateUtils.convert(dates[1]);
+ } else if (entry.getKey().equals("settle")) {
+ settle = Integer.parseInt(val);
+ } else if (entry.getKey().equals("status")) {
+ status = Integer.parseInt(val);
+ }
+// else if (entry.getKey().equals("order_no")) {
+// orderNo = val;
+// }
+ else if (entry.getKey().equals("item_name")) {
+ itemName = val;
+ } else if (entry.getKey().equals("cstmr_name")) {
+ cstmrName = val;
+ }
+ }
+ List<OrderPakoutMainVo> orderPakoutMainVos = orderService.selectOrderPakoutMainVoList(itemName, cstmrName, settle, status, modiTimeStart, modiTimeEnd, curr, limit);
+ Page<OrderPakoutMainVo> page = new Page<OrderPakoutMainVo>(curr, limit).setRecords(orderPakoutMainVos);
+ page.setTotal(orderService.selectOrderPakoutMainVoListTotal(itemName, cstmrName, settle, status, modiTimeStart, modiTimeEnd));
+ return R.ok(page);
+ } catch (Exception e){
+
+ }
+ return R.error();
+ }
}
--
Gitblit v1.9.1