From 9f96a3fa144da895976ee1be96b752786720aff1 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 30 十月 2024 13:06:44 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OpenController.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 1e2b75c..b683199 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -32,6 +32,8 @@
add("ea1f0459efc02a79f046f982767939ae");
}};
+
+
@Autowired
private OpenService openService;
@@ -86,6 +88,7 @@
public synchronized R orderAccept(@RequestHeader(required = false) String appkey,
@RequestBody(required = true) OrderSyncParam param,
HttpServletRequest request){
+ log.info("鐢熸垚閫�璐цˉ璐у崟鎹�,{}",JSON.toJSONString(param));
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -105,12 +108,13 @@
public synchronized R orderPakin(@RequestHeader(required = false) String appkey,
@RequestBody(required = true) OrderSyncParam param,
HttpServletRequest request){
+ log.info("鐢熸垚鍏ュ簱鍗曟嵁,{}",JSON.toJSONString(param));
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- String docName = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇閲囪喘鍏ュ簱鍗�" : "閾跺骇閲囪喘閫�璐у崟";
+ String docName = !Cools.isEmpty(param.getOrderType()) ? param.getOrderType() : param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇閲囪喘鍏ュ簱鍗�" : "閾跺骇閲囪喘閫�璐у崟";
boolean pakin = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
openService.syncOrder(param,pakin,docName);
@@ -119,13 +123,33 @@
}
+ /*
+ 鐩樼偣鎺ュ彛
+ */
+ @PostMapping("/check/default/v1")
+ @AppAuth(memo = "搴撳瓨鐩樼偣")
+ public synchronized R checkLoc(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = true) CheckParam param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+
+ openService.checkAndAdjustLocDetl(param);
+
+ return R.ok("搴撳瓨璋冩暣鎴愬姛");
+
+ }
+
+
@PostMapping("/order/pakout/default/v1")
@AppAuth(memo = "鍚屾宸ュ崟鍗曟嵁")
public synchronized R orderPakout(@RequestHeader(required = false) String appkey,
//@RequestBody(required = false) HashMap<String,Object> param,
@RequestBody(required = false) OrderProdSyncParam param,
HttpServletRequest request){
-
+ log.info("鍚屾宸ュ崟鍗曟嵁,{}",JSON.toJSONString(param));
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -156,6 +180,7 @@
public synchronized R orderDelete(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) Map<String, Object> param,
HttpServletRequest request){
+ log.info("鍗曟嵁鍒犻櫎瀹℃牳,{}",JSON.toJSONString(param));
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
--
Gitblit v1.9.1