From af11d4845251da536d564a82fa019b4306875da9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 29 五月 2021 14:48:54 +0800
Subject: [PATCH] Merge branch 'htwms' of https://gitee.com/luxiaotao1123/wms-cloud into htwms
---
src/main/java/zy/cloud/wms/manager/controller/OrderSettleController.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/OrderSettleController.java b/src/main/java/zy/cloud/wms/manager/controller/OrderSettleController.java
index 06a82fe..67a138a 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/OrderSettleController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/OrderSettleController.java
@@ -1,6 +1,5 @@
package zy.cloud.wms.manager.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -16,10 +15,7 @@
import zy.cloud.wms.manager.entity.OrderSettle;
import zy.cloud.wms.manager.service.OrderSettleService;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
public class OrderSettleController extends BaseController {
@@ -63,6 +59,10 @@
@RequestMapping(value = "/orderSettle/add/auth")
@ManagerAuth
public R add(OrderSettle orderSettle) {
+ orderSettle.setCreateBy(getUserId());
+ orderSettle.setCreateTime(new Date());
+ orderSettle.setUpdateBy(getUserId());
+ orderSettle.setUpdateTime(new Date());
orderSettleService.insert(orderSettle);
return R.ok();
}
@@ -73,19 +73,17 @@
if (Cools.isEmpty(orderSettle) || null==orderSettle.getOrderSettle()){
return R.error();
}
+ orderSettle.setUpdateBy(getUserId());
+ orderSettle.setUpdateTime(new Date());
orderSettleService.updateById(orderSettle);
return R.ok();
}
@RequestMapping(value = "/orderSettle/delete/auth")
@ManagerAuth
- public R delete(@RequestParam String param){
- List<OrderSettle> list = JSONArray.parseArray(param, OrderSettle.class);
- if (Cools.isEmpty(list)){
- return R.error();
- }
- for (OrderSettle entity : list){
- orderSettleService.delete(new EntityWrapper<>(entity));
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ orderSettleService.deleteById(id);
}
return R.ok();
}
--
Gitblit v1.9.1