From f55b2623f09b0b902f991c701c67a2a6f2577057 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 23 四月 2024 11:07:53 +0800
Subject: [PATCH] 调整order指令包结构
---
src/main/java/com/fzzy/order/common/data/OrderCommonResult.java | 35 +++++++
src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java | 8
src/main/java/com/fzzy/order/common/OrderCommonService.java | 30 ++++++
src/main/java/com/fzzy/order/common/data/OrderCommonReq.java | 4
src/main/java/com/fzzy/order/common/package-info.java | 6 +
src/main/java/com/fzzy/order/common/data/OrderCommonResp.java | 8
src/main/java/com/fzzy/push/gd2022/GD2022OrderServiceImpl.java | 12 +-
src/main/java/com/fzzy/push/nx2023/NX2023OrderServiceImpl.java | 12 +-
src/main/java/com/fzzy/push/sx2023/package-info.java | 7 +
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 8
/dev/null | 35 -------
src/main/java/com/fzzy/order/common/OrderCommonController.java | 62 ++++++++++++
src/main/java/com/fzzy/push/sh2023/SH2023OrderServiceImpl.java | 12 +-
src/main/java/com/fzzy/order/common/OrderCommonManager.java | 20 ++--
src/main/java/com/fzzy/order/common/data/OrderCommonData.java | 4
src/main/java/com/fzzy/push/whhpjl/WhjlOrderApiServiceImpl.java | 8
src/main/java/com/fzzy/order/common/data/OrderCommonConstant.java | 4
17 files changed, 190 insertions(+), 85 deletions(-)
diff --git a/src/main/java/com/fzzy/order/OrderApiService.java b/src/main/java/com/fzzy/order/OrderApiService.java
deleted file mode 100644
index 83ee7f4..0000000
--- a/src/main/java/com/fzzy/order/OrderApiService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.fzzy.order;
-
-import com.fzzy.api.entity.ApiConfs;
-import com.fzzy.order.data.OrderData;
-
-import java.text.ParseException;
-
-/**
- * 鏍规嵁鍗忚瑙ｆ瀽鎸囦护
- *
- * @author czt
- */
-public interface OrderApiService {
-
- /**
- * 鑾峰彇鍗忚缂栫爜
- *
- * @return
- */
- public String getProtocol();
-
- /**
- * 瑙ｆ瀽鎸囦护
- * @param req
- * @return
- * @throws Exception
- */
-
- public void execute(OrderData req, String orderType, ApiConfs apiConfs, String orderid) throws ParseException;
-}
diff --git a/src/main/java/com/fzzy/order/OrderServer.java b/src/main/java/com/fzzy/order/OrderServer.java
deleted file mode 100644
index a047992..0000000
--- a/src/main/java/com/fzzy/order/OrderServer.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.fzzy.order;
-
-import com.alibaba.fastjson.JSONObject;
-import com.fzzy.order.data.*;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * 涓嬪彂鎸囦护鎺ユ敹鍏ュ彛
- *
- * @author czt
- * @date 2023/8/17
- */
-@Slf4j
-@Controller
-@RequestMapping("service/api")
-public class OrderServer {
-
- @Autowired
- private OrderManager orderManager;
- /**
- * 鐧诲綍鍏ュ彛
- * @param req
- * @return
- */
- @SuppressWarnings("unchecked")
- @ResponseBody
- @RequestMapping("/order")
- public OrderResp order(@RequestBody OrderReq<JSONObject> req){
-
- log.info("鎺ユ敹鐨勬寚浠や俊鎭�={}", req);
- //鍒ゆ柇鍙傛暟
- if(null == req){
- return new OrderResp(OrderResult.ORDER_CODE_500.getCode(), OrderResult.ORDER_CODE_500.getResult());
- }
-
- //蹇冭烦鎸囦护锛岀洿鎺ヨ繑鍥�
- if(OrderConstant.ORDER_TYPE_0.equals(req.getType())){
- OrderResp resp = new OrderResp(OrderResult.ORDER_CODE_200.getCode(), OrderResult.ORDER_CODE_200.getResult());
- log.info("蹇冭烦鎸囦护杩斿洖淇℃伅={}", resp);
- return resp;
- }
-
- try {
-
- //寮傛鎵ц
- orderManager.execute(req);
-
- return new OrderResp(OrderResult.ORDER_CODE_200.getCode(), OrderResult.ORDER_CODE_200.getResult());
-
- } catch (Exception e) {
-
- return new OrderResp(OrderResult.ORDER_CODE_500.getCode(), OrderResult.ORDER_CODE_500.getResult());
- }
-
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/order/common/OrderCommonController.java b/src/main/java/com/fzzy/order/common/OrderCommonController.java
new file mode 100644
index 0000000..10c1e3c
--- /dev/null
+++ b/src/main/java/com/fzzy/order/common/OrderCommonController.java
@@ -0,0 +1,62 @@
+package com.fzzy.order.common;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fzzy.order.common.data.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * 涓嬪彂鎸囦护鎺ユ敹鍏ュ彛 --- 鐩墠涓婃捣浣跨敤
+ *
+ * @author czt
+ * @date 2023/8/17
+ */
+@Slf4j
+@Controller
+@RequestMapping("service/api")
+public class OrderCommonController {
+
+ @Autowired
+ private OrderCommonManager orderManager;
+ /**
+ * 鐧诲綍鍏ュ彛
+ * @param req
+ * @return
+ */
+ @SuppressWarnings("unchecked")
+ @ResponseBody
+ @RequestMapping("/order")
+ public OrderCommonResp order(@RequestBody OrderCommonReq<JSONObject> req){
+
+ log.info("鎺ユ敹鐨勬寚浠や俊鎭�={}", req);
+ //鍒ゆ柇鍙傛暟
+ if(null == req){
+ return new OrderCommonResp(OrderCommonResult.ORDER_CODE_500.getCode(), OrderCommonResult.ORDER_CODE_500.getResult());
+ }
+
+ //蹇冭烦鎸囦护锛岀洿鎺ヨ繑鍥�
+ if(OrderCommonConstant.ORDER_TYPE_0.equals(req.getType())){
+ OrderCommonResp resp = new OrderCommonResp(OrderCommonResult.ORDER_CODE_200.getCode(), OrderCommonResult.ORDER_CODE_200.getResult());
+ log.info("蹇冭烦鎸囦护杩斿洖淇℃伅={}", resp);
+ return resp;
+ }
+
+ try {
+
+ //寮傛鎵ц
+ orderManager.execute(req);
+
+ return new OrderCommonResp(OrderCommonResult.ORDER_CODE_200.getCode(), OrderCommonResult.ORDER_CODE_200.getResult());
+
+ } catch (Exception e) {
+
+ return new OrderCommonResp(OrderCommonResult.ORDER_CODE_500.getCode(), OrderCommonResult.ORDER_CODE_500.getResult());
+ }
+
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/order/OrderManager.java b/src/main/java/com/fzzy/order/common/OrderCommonManager.java
similarity index 74%
rename from src/main/java/com/fzzy/order/OrderManager.java
rename to src/main/java/com/fzzy/order/common/OrderCommonManager.java
index 1e961bd..edad061 100644
--- a/src/main/java/com/fzzy/order/OrderManager.java
+++ b/src/main/java/com/fzzy/order/common/OrderCommonManager.java
@@ -1,10 +1,10 @@
-package com.fzzy.order;
+package com.fzzy.order.common;
import com.alibaba.fastjson.JSONObject;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.view.pr.ApiConfsPR;
-import com.fzzy.order.data.OrderData;
-import com.fzzy.order.data.OrderReq;
+import com.fzzy.order.common.data.OrderCommonData;
+import com.fzzy.order.common.data.OrderCommonReq;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,18 +23,18 @@
* @date 2023/8/17
*/
@Slf4j
-@Component(OrderManager.BEAN_ID)
-public class OrderManager implements ApplicationContextAware {
+@Component(OrderCommonManager.BEAN_ID)
+public class OrderCommonManager implements ApplicationContextAware {
public static final String BEAN_ID = "order.orderManager";
- private static Map<String, OrderApiService> serviceMap;
+ private static Map<String, OrderCommonService> serviceMap;
@Autowired
private ApiConfsPR apiConfsPR;
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
- Map<String, OrderApiService> map = applicationContext.getBeansOfType(OrderApiService.class);
+ Map<String, OrderCommonService> map = applicationContext.getBeansOfType(OrderCommonService.class);
serviceMap = new HashMap<>();
for (String key : map.keySet()) {
serviceMap.put(map.get(key).getProtocol(), map.get(key));
@@ -47,7 +47,7 @@
* @param req
*/
@Async
- public void execute(OrderReq<JSONObject> req){
+ public void execute(OrderCommonReq<JSONObject> req){
try{
//鑾峰彇閰嶇疆淇℃伅
@@ -55,10 +55,10 @@
if(null == apiConfList || apiConfList.isEmpty()){
return;
}
- OrderData data = JSONObject.parseObject(req.getData().toString(), OrderData.class);
+ OrderCommonData data = JSONObject.parseObject(req.getData().toString(), OrderCommonData.class);
data.setOrderid(req.getOrderid());
//鏍规嵁閰嶇疆淇℃伅鎵ц
- OrderApiService service;
+ OrderCommonService service;
for (ApiConfs conf : apiConfList) {
service = serviceMap.get(conf.getPushProtocol());
diff --git a/src/main/java/com/fzzy/order/common/OrderCommonService.java b/src/main/java/com/fzzy/order/common/OrderCommonService.java
new file mode 100644
index 0000000..a7ba866
--- /dev/null
+++ b/src/main/java/com/fzzy/order/common/OrderCommonService.java
@@ -0,0 +1,30 @@
+package com.fzzy.order.common;
+
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.order.common.data.OrderCommonData;
+
+import java.text.ParseException;
+
+/**
+ * 鏍规嵁鍗忚瑙ｆ瀽鎸囦护
+ *
+ * @author czt
+ */
+public interface OrderCommonService {
+
+ /**
+ * 鑾峰彇鍗忚缂栫爜
+ *
+ * @return
+ */
+ public String getProtocol();
+
+ /**
+ * 瑙ｆ瀽鎸囦护
+ * @param req
+ * @return
+ * @throws Exception
+ */
+
+ public void execute(OrderCommonData req, String orderType, ApiConfs apiConfs, String orderid) throws ParseException;
+}
diff --git a/src/main/java/com/fzzy/order/data/OrderConstant.java b/src/main/java/com/fzzy/order/common/data/OrderCommonConstant.java
similarity index 80%
rename from src/main/java/com/fzzy/order/data/OrderConstant.java
rename to src/main/java/com/fzzy/order/common/data/OrderCommonConstant.java
index 041b2c3..ae999c1 100644
--- a/src/main/java/com/fzzy/order/data/OrderConstant.java
+++ b/src/main/java/com/fzzy/order/common/data/OrderCommonConstant.java
@@ -1,11 +1,11 @@
-package com.fzzy.order.data;
+package com.fzzy.order.common.data;
/**
* 鎸囦护-甯搁噺绫�
* @author czt
* @date 2023/8/17
*/
-public class OrderConstant {
+public class OrderCommonConstant {
/**
* 鎸囦护绫诲瀷
diff --git a/src/main/java/com/fzzy/order/data/OrderData.java b/src/main/java/com/fzzy/order/common/data/OrderCommonData.java
similarity index 84%
rename from src/main/java/com/fzzy/order/data/OrderData.java
rename to src/main/java/com/fzzy/order/common/data/OrderCommonData.java
index 1d556e3..89bb2cf 100644
--- a/src/main/java/com/fzzy/order/data/OrderData.java
+++ b/src/main/java/com/fzzy/order/common/data/OrderCommonData.java
@@ -1,4 +1,4 @@
-package com.fzzy.order.data;
+package com.fzzy.order.common.data;
import lombok.Data;
import java.io.Serializable;
@@ -9,7 +9,7 @@
* @date 2023/08/17
*/
@Data
-public class OrderData implements Serializable {
+public class OrderCommonData implements Serializable {
/**
* 鎺ュ彛鍐呭锛屽涓腑闂寸敤鑻辨枃閫楀彿闅斿紑
diff --git a/src/main/java/com/fzzy/order/data/OrderReq.java b/src/main/java/com/fzzy/order/common/data/OrderCommonReq.java
similarity index 75%
rename from src/main/java/com/fzzy/order/data/OrderReq.java
rename to src/main/java/com/fzzy/order/common/data/OrderCommonReq.java
index db6781b..5b7f83d 100644
--- a/src/main/java/com/fzzy/order/data/OrderReq.java
+++ b/src/main/java/com/fzzy/order/common/data/OrderCommonReq.java
@@ -1,4 +1,4 @@
-package com.fzzy.order.data;
+package com.fzzy.order.common.data;
import lombok.Data;
import java.io.Serializable;
@@ -9,7 +9,7 @@
* @date 2023/08/17
*/
@Data
-public class OrderReq<T> implements Serializable {
+public class OrderCommonReq<T> implements Serializable {
/**
* 鎸囦护id
diff --git a/src/main/java/com/fzzy/order/data/OrderResp.java b/src/main/java/com/fzzy/order/common/data/OrderCommonResp.java
similarity index 64%
rename from src/main/java/com/fzzy/order/data/OrderResp.java
rename to src/main/java/com/fzzy/order/common/data/OrderCommonResp.java
index e9e9890..f57bc67 100644
--- a/src/main/java/com/fzzy/order/data/OrderResp.java
+++ b/src/main/java/com/fzzy/order/common/data/OrderCommonResp.java
@@ -1,4 +1,4 @@
-package com.fzzy.order.data;
+package com.fzzy.order.common.data;
import lombok.Data;
@@ -10,7 +10,7 @@
* @date 2023/08/17
*/
@Data
-public class OrderResp<T> implements Serializable {
+public class OrderCommonResp<T> implements Serializable {
/**
*
*/
@@ -21,10 +21,10 @@
private String result;
- public OrderResp() {
+ public OrderCommonResp() {
}
- public OrderResp(String code, String result) {
+ public OrderCommonResp(String code, String result) {
this.code = code;
this.result = result;
}
diff --git a/src/main/java/com/fzzy/order/common/data/OrderCommonResult.java b/src/main/java/com/fzzy/order/common/data/OrderCommonResult.java
new file mode 100644
index 0000000..684f828
--- /dev/null
+++ b/src/main/java/com/fzzy/order/common/data/OrderCommonResult.java
@@ -0,0 +1,35 @@
+package com.fzzy.order.common.data;
+
+/**
+ * 鎸囦护鍙嶉鐮�
+ */
+public enum OrderCommonResult {
+
+ ORDER_CODE_200("200", "鎸囦护瑙ｆ瀽鎴愬姛"),
+ ORDER_CODE_500("500", "鎸囦护瑙ｆ瀽澶辫触");
+
+ private String code;
+ private String result;
+
+ OrderCommonResult(String code, String msg) {
+ this.code = code;
+ this.result = msg;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public String getResult() {
+ return result;
+ }
+
+ public static String getMsg(String code) {
+ if(null == code) return null;
+
+ if(OrderCommonResult.ORDER_CODE_200.getCode().equals(code)) return OrderCommonResult.ORDER_CODE_200.getResult();
+ if(OrderCommonResult.ORDER_CODE_500.getCode().equals(code)) return OrderCommonResult.ORDER_CODE_500.getResult();
+ return code;
+ }
+
+}
diff --git a/src/main/java/com/fzzy/order/common/package-info.java b/src/main/java/com/fzzy/order/common/package-info.java
new file mode 100644
index 0000000..d72a5eb
--- /dev/null
+++ b/src/main/java/com/fzzy/order/common/package-info.java
@@ -0,0 +1,6 @@
+/**
+ * @Description 鍏叡鎸囦护鍖咃細鎸囦护璺緞鑷畾涔夈�備笂娴蜂娇鐢紝骞夸笢娴嬭瘯浣跨敤锛�
+ * @Author CZT
+ * @Date 2024/4/23 9:45
+ */
+package com.fzzy.order.common;
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/order/data/OrderResult.java b/src/main/java/com/fzzy/order/data/OrderResult.java
deleted file mode 100644
index 9b4b90a..0000000
--- a/src/main/java/com/fzzy/order/data/OrderResult.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.fzzy.order.data;
-
-/**
- * 鎸囦护鍙嶉鐮�
- */
-public enum OrderResult {
-
- ORDER_CODE_200("200", "鎸囦护瑙ｆ瀽鎴愬姛"),
- ORDER_CODE_500("500", "鎸囦护瑙ｆ瀽澶辫触");
-
- private String code;
- private String result;
-
- OrderResult(String code, String msg) {
- this.code = code;
- this.result = msg;
- }
-
- public String getCode() {
- return code;
- }
-
- public String getResult() {
- return result;
- }
-
- public static String getMsg(String code) {
- if(null == code) return null;
-
- if(OrderResult.ORDER_CODE_200.getCode().equals(code)) return OrderResult.ORDER_CODE_200.getResult();
- if(OrderResult.ORDER_CODE_500.getCode().equals(code)) return OrderResult.ORDER_CODE_500.getResult();
- return code;
- }
-
-}
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022OrderApiServiceImpl.java b/src/main/java/com/fzzy/push/gd2022/GD2022OrderServiceImpl.java
similarity index 94%
rename from src/main/java/com/fzzy/push/gd2022/GD2022OrderApiServiceImpl.java
rename to src/main/java/com/fzzy/push/gd2022/GD2022OrderServiceImpl.java
index 33c4a54..14c6232 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022OrderApiServiceImpl.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022OrderServiceImpl.java
@@ -3,9 +3,9 @@
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
-import com.fzzy.order.OrderApiService;
-import com.fzzy.order.data.OrderConstant;
-import com.fzzy.order.data.OrderData;
+import com.fzzy.order.common.OrderCommonService;
+import com.fzzy.order.common.data.OrderCommonConstant;
+import com.fzzy.order.common.data.OrderCommonData;
import com.fzzy.push.impl.ComPushService11;
import com.fzzy.push.impl.ComPushService12;
import com.fzzy.push.impl.ComPushService13;
@@ -26,7 +26,7 @@
*/
@Slf4j
@Service
-public class GD2022OrderApiServiceImpl implements OrderApiService {
+public class GD2022OrderServiceImpl implements OrderCommonService {
@Autowired
private GD2022ApiRemoteService2022 apiRemoteService;
@@ -46,10 +46,10 @@
@Override
- public void execute(OrderData req, String orderType, ApiConfs conf, String orderid) throws ParseException {
+ public void execute(OrderCommonData req, String orderType, ApiConfs conf, String orderid) throws ParseException {
// 鑻ユ寚浠ょ被鍨嬩笉涓�1锛屽垯杩斿洖
- if(!OrderConstant.ORDER_TYPE_1.equals(orderType)){
+ if(!OrderCommonConstant.ORDER_TYPE_1.equals(orderType)){
log.error("鎸囦护绫诲瀷涓嶄负1锛屼笉杩涜鏁版嵁涓婃姤={}", req);
return;
}
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
index a198632..8442b48 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
@@ -10,7 +10,7 @@
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.*;
-import com.fzzy.order.data.OrderData;
+import com.fzzy.order.common.data.OrderCommonData;
import com.fzzy.push.nx2023.dto.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -119,9 +119,9 @@
//鎸囦护id
String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
String orderId = reqData.getId();
- OrderData orderData = (OrderData) redisUtil.get(key);
- if (null != orderData && StringUtils.isNotEmpty(orderData.getOrderid())) {
- orderId = orderData.getOrderid();
+ OrderCommonData orderCommonData = (OrderCommonData) redisUtil.get(key);
+ if (null != orderCommonData && StringUtils.isNotEmpty(orderCommonData.getOrderid())) {
+ orderId = orderCommonData.getOrderid();
}
reqData.setOrderid(orderId);
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023OrderApiServiceImpl.java b/src/main/java/com/fzzy/push/nx2023/NX2023OrderServiceImpl.java
similarity index 94%
rename from src/main/java/com/fzzy/push/nx2023/NX2023OrderApiServiceImpl.java
rename to src/main/java/com/fzzy/push/nx2023/NX2023OrderServiceImpl.java
index 4734068..ce56b7e 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023OrderApiServiceImpl.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023OrderServiceImpl.java
@@ -5,9 +5,9 @@
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.utils.RedisConst;
import com.fzzy.api.utils.RedisUtil;
-import com.fzzy.order.OrderApiService;
-import com.fzzy.order.data.OrderConstant;
-import com.fzzy.order.data.OrderData;
+import com.fzzy.order.common.OrderCommonService;
+import com.fzzy.order.common.data.OrderCommonConstant;
+import com.fzzy.order.common.data.OrderCommonData;
import com.fzzy.push.impl.ComPushService11;
import com.fzzy.push.impl.ComPushService12;
import com.fzzy.push.impl.ComPushService13;
@@ -27,7 +27,7 @@
*/
@Slf4j
@Service
-public class NX2023OrderApiServiceImpl implements OrderApiService {
+public class NX2023OrderServiceImpl implements OrderCommonService {
@Autowired
private RedisUtil redisUtil;
@@ -49,10 +49,10 @@
@Override
- public void execute(OrderData req, String orderType, ApiConfs conf, String orderid) throws ParseException {
+ public void execute(OrderCommonData req, String orderType, ApiConfs conf, String orderid) throws ParseException {
// 鑻ユ寚浠ょ被鍨嬩笉涓�1锛屽垯杩斿洖
- if(!OrderConstant.ORDER_TYPE_1.equals(orderType)){
+ if(!OrderCommonConstant.ORDER_TYPE_1.equals(orderType)){
log.error("鎸囦护绫诲瀷涓嶄负1锛屼笉杩涜鏁版嵁涓婃姤={}", req);
return;
}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 6c644f0..25f783b 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -10,7 +10,7 @@
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.*;
-import com.fzzy.order.data.OrderData;
+import com.fzzy.order.common.data.OrderCommonData;
import com.fzzy.push.sh2023.dto.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -123,8 +123,8 @@
//鑾峰彇鎸囦护id
String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
- OrderData orderData = (OrderData) redisUtil.get(key);
- if (null == orderData || StringUtils.isEmpty(orderData.getOrderid())) {
+ OrderCommonData orderCommonData = (OrderCommonData) redisUtil.get(key);
+ if (null == orderCommonData || StringUtils.isEmpty(orderCommonData.getOrderid())) {
log.error("鎸囦护id澶辨晥=" + jsonData);
ResponseDto responseDto = new ResponseDto(99, "鎸囦护id澶辨晥");
apiLog.setStatus(99);
@@ -139,7 +139,7 @@
//鑾峰彇韬唤ID锛屽嵆琛屾斂鍖哄垝鐮�
reqData.setUid(conf.getUserName());
//鎸囦护id
- reqData.setOrderid(orderData.getOrderid());
+ reqData.setOrderid(orderCommonData.getOrderid());
//韬唤绛惧悕锛屼娇鐢ㄨ嚜鏈塕SA绉侀挜杩涜鍔犲瘑(鍦板尯琛屾斂鍖哄垝浠ｇ爜_褰撳ぉ鏃ユ湡)
reqData.setAccess_token(ShRSAUtils.sign(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPassword()));
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023OrderApiServiceImpl.java b/src/main/java/com/fzzy/push/sh2023/SH2023OrderServiceImpl.java
similarity index 95%
rename from src/main/java/com/fzzy/push/sh2023/SH2023OrderApiServiceImpl.java
rename to src/main/java/com/fzzy/push/sh2023/SH2023OrderServiceImpl.java
index 78c288c..e199b0a 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023OrderApiServiceImpl.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023OrderServiceImpl.java
@@ -5,9 +5,9 @@
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.utils.RedisConst;
import com.fzzy.api.utils.RedisUtil;
-import com.fzzy.order.OrderApiService;
-import com.fzzy.order.data.OrderConstant;
-import com.fzzy.order.data.OrderData;
+import com.fzzy.order.common.OrderCommonService;
+import com.fzzy.order.common.data.OrderCommonConstant;
+import com.fzzy.order.common.data.OrderCommonData;
import com.fzzy.push.impl.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -25,7 +25,7 @@
*/
@Slf4j
@Service
-public class SH2023OrderApiServiceImpl implements OrderApiService {
+public class SH2023OrderServiceImpl implements OrderCommonService {
@Autowired
private RedisUtil redisUtil;
@@ -49,10 +49,10 @@
@Override
- public void execute(OrderData req, String orderType, ApiConfs conf, String orderid) throws ParseException {
+ public void execute(OrderCommonData req, String orderType, ApiConfs conf, String orderid) throws ParseException {
// 鑻ユ寚浠ょ被鍨嬩笉涓�1锛屽垯杩斿洖
- if(!OrderConstant.ORDER_TYPE_1.equals(orderType)){
+ if(!OrderCommonConstant.ORDER_TYPE_1.equals(orderType)){
log.error("鎸囦护绫诲瀷涓嶄负1锛屼笉杩涜鏁版嵁涓婃姤={}", req);
return;
}
diff --git a/src/main/java/com/fzzy/push/sx2023/package-info.java b/src/main/java/com/fzzy/push/sx2023/package-info.java
new file mode 100644
index 0000000..3d7e2da
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sx2023/package-info.java
@@ -0,0 +1,7 @@
+
+/**
+ * @Description 闄曡タ鐪佸钩鍙版帴鍙ｆ湇鍔�
+ * @Author CZT
+ * @Date 2024/4/22 19:45
+ */
+package com.fzzy.push.sx2023;
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlOrderApiServiceImpl.java b/src/main/java/com/fzzy/push/whhpjl/WhjlOrderApiServiceImpl.java
index 286e6b4..3e979a0 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlOrderApiServiceImpl.java
+++ b/src/main/java/com/fzzy/push/whhpjl/WhjlOrderApiServiceImpl.java
@@ -2,8 +2,8 @@
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
-import com.fzzy.order.OrderApiService;
-import com.fzzy.order.data.OrderData;
+import com.fzzy.order.common.OrderCommonService;
+import com.fzzy.order.common.data.OrderCommonData;
import org.springframework.stereotype.Service;
/**
@@ -13,7 +13,7 @@
* @date 2023/08/17
*/
@Service
-public class WhjlOrderApiServiceImpl implements OrderApiService {
+public class WhjlOrderApiServiceImpl implements OrderCommonService {
@Override
public String getProtocol() {
@@ -22,7 +22,7 @@
@Override
- public void execute(OrderData req, String orderType, ApiConfs apiConfs, String orderid) {
+ public void execute(OrderCommonData req, String orderType, ApiConfs apiConfs, String orderid) {
//TODO 寰呭疄鐜�
--
Gitblit v1.9.3