From fb4e25eb597358276470daeb9df7a40e0d622616 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 09 四月 2022 14:37:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 73 +++++++++++++++++++++++++++---------
1 files changed, 54 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 0f94938..8002f80 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,35 +1,42 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
-import com.zy.asrs.entity.Order;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.param.OpenOrderCompleteParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.service.OpenService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
/**
* Created by vincent on 2022/4/8
*/
+@Slf4j
@RestController
-@RequestMapping("open/asrs/")
+@RequestMapping("open/asrs")
public class OpenController {
+ private static final boolean auth = false;
+ public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
+ add("ea1f0459efc02a79f046f982767939ae");
+ }};
+
@Autowired
- private OrderService orderService;
- @Autowired
- private OrderDetlService orderDetlService;
+ private OpenService openService;
/**
* 娣诲姞鍏ュ簱鍗�
*/
- @PostMapping("order/pakin/default/v1")
- public synchronized R orderCreate(@RequestBody OpenOrderPakinParam param) {
+ @PostMapping("/order/pakin/new/default/v1")
+ public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
+ @RequestBody OpenOrderPakinParam param) {
+ auth(appkey, param);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
@@ -37,18 +44,46 @@
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
}
if (Cools.isEmpty(param.getOrderType())) {
- return R.error("鍗曟嵁绫诲瀷[orderType]閿欒");
+ return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
}
if (Cools.isEmpty(param.getOrderDetails())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
- Order order = orderService.selectByNo(param.getOrderNo());
- if (!Cools.isEmpty(order)) {
- return R.error(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
- }
-
+ openService.pakinOrderCreate(param);
return R.ok();
}
+ /**
+ * 鍏ュ簱鍗曞洖鍐�
+ */
+ @PostMapping("/order/pakin/complete/default/v1")
+ public synchronized R orderComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody OpenOrderCompleteParam param) {
+ auth(appkey, param);
+ return R.ok().add(openService.pakinOrderComplete(param));
+ }
+
+ /**
+ * 搴撳瓨缁熻
+ */
+ @RequestMapping("/stock/default/v1")
+ public R queryStock(@RequestHeader(required = false) String appkey) {
+ auth(appkey, null);
+ return R.ok().add(openService.queryStock());
+ }
+
+
+ private void auth(String appkey, Object obj) {
+ log.info("{}鎺ュ彛琚闂紒appkey:{},璇锋眰鏁版嵁锛歿}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+ if (!auth) {
+ return;
+ }
+ if (Cools.isEmpty(appkey)) {
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
+ }
+ if (!APP_KEY_LIST.contains(appkey)) {
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
+ }
+ }
}
--
Gitblit v1.9.1