From d41358fce9a436d81b9341d06fc1d8f3ddff92ff Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 25 九月 2023 16:17:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
index ce14034..58c86e5 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
@@ -14,7 +14,6 @@
import com.dsh.course.feignClient.activity.PointMercharsClient;
import com.dsh.course.feignClient.activity.model.*;
import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
import com.dsh.guns.core.base.tips.ErrorTip;
import com.dsh.guns.core.base.tips.SuccessTip;
import com.dsh.guns.core.common.constant.factory.PageFactory;
@@ -49,7 +48,7 @@
@Controller
@RequestMapping("/tGoods")
-public class TGoodsController extends BaseController {
+public class TGoodsController {
@@ -435,19 +434,10 @@
*/
@RequestMapping("/write_off")
@ResponseBody
- public Object GoodsWriteOff(String id){
- Integer objectType = UserExt.getUser().getObjectType();
- Map<String, Object> stringObjectHashMap = new HashMap<>();
- stringObjectHashMap.put("goodsId",id);
- stringObjectHashMap.put("managerId",objectType);
- boolean b = pointMercharsClient.writeOffGoodsStatus(stringObjectHashMap);
- System.out.println(b);
- if (b){
- return new SuccessTip<>();
- }else {
- return ERROR;
- }
-
+ public Object GoodsWriteOff(Integer id){
+ System.out.println(id);
+ // TODO: 2023/8/15 核销操作
+ return new SuccessTip<>();
}
--
Gitblit v1.7.1