From 3fa0f0b6707a0f6f696659c6e0797f8377c5e6dc Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 27 五月 2024 17:03:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs
---
src/main/java/com/zy/asrs/controller/OpenController.java | 19 +++++++++++++++++++
src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java | 4 ++++
2 files changed, 23 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 be9083f..7b763f5 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -279,6 +279,25 @@
}
+ @PostMapping("/order/pak/default/v1")
+ @AppAuth(memo = "鐢熸垚閫�璐цˉ璐у崟鎹�")
+ public synchronized R orderAccept(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = true) OrderSyncParam param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+
+ String docName = param.get鎿嶄綔鍗曟嵁();
+ boolean pakin = param.getPakin() == 1 ? true : false;
+
+ openService.syncOrder(param,pakin,docName);
+
+ return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
+
+ }
+
@PostMapping("/order/pakin/default/v1")
@AppAuth(memo = "鐢熸垚鍏ュ簱鍗曟嵁")
public synchronized R orderPakin(@RequestHeader(required = false) String appkey,
diff --git a/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java b/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
index d495e78..5f3f9c3 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
@@ -9,6 +9,10 @@
private String 鎿嶄綔绯荤粺鍙�;
private String 鎿嶄綔鍗曟嵁;
private String 鎿嶄綔绫诲瀷;
+
+ //鍏ュ嚭搴撴爣璁�
+ private Integer pakin;
+
//閲囪喘璁㈠崟缂栧彿
private String cPOID;
//渚涘簲鍟嗙紪鐮�
--
Gitblit v1.9.1