From 0caed17a984ea21a0b92478f52cf90c101d1085e Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 08 七月 2024 16:08:38 +0800
Subject: [PATCH] Merge branch 'tzhneasrs' of http://47.97.1.152:5880/r/zy-asrs into tzhneasrs
---
src/main/java/com/zy/asrs/controller/OpenController.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index d1a2ce2..8e1b57d 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -5,10 +5,12 @@
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocOwner;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.StockVo;
+import com.zy.asrs.service.LocOwnerService;
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
@@ -19,9 +21,11 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.security.acl.Owner;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* Created by vincent on 2022/4/8
@@ -42,6 +46,8 @@
private OrderService orderService;
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private LocOwnerService locOwnerService;
@PostMapping("/order/matSync/default/v1")
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
@@ -56,6 +62,32 @@
return R.ok();
}
+ @PostMapping("/order/ownerSync/default/v1")
+ @AppAuth(memo = "渚涘簲鍟嗘。妗堝悓姝ユ帴鍙�")
+ public synchronized R syncOwnerInfo(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) Map<String,String> param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+
+ Integer deleteFlag = Integer.parseInt(param.get("deleteFlag"));
+
+ if (deleteFlag == 1){
+ locOwnerService.delete(new EntityWrapper<LocOwner>().eq("owner",param.get("owner")));
+ }else {
+ LocOwner locOwner = new LocOwner();
+ locOwner.setOwner(param.get("owner"));
+ locOwner.setPhone(param.get("phone"));
+ locOwner.setAddr(param.get("addr"));
+ locOwnerService.insert(locOwner);
+ }
+
+
+ return R.ok();
+ }
+
/**
* 娣诲姞鍏ュ簱鍗�
*/
--
Gitblit v1.9.1