From 3331e358f12dd29b15eb94e6f57d0d11ccd8182c Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期五, 23 九月 2022 10:06:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java | 15 ++++++++-------
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java | 2 +-
phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncProjectService.java | 8 ++++++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java | 12 ++++++++++++
4 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
index ce6f995..d52c540 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
@@ -49,14 +49,15 @@
/*****************绫诲瀷淇℃伅 娉細浠ヤ笅甯搁噺浠his鐨刄serMoneyLog甯搁噺涓轰富*******************************/
- /**鎿嶄綔浜虹被鍨�-鐢ㄦ埛*/
- public static final int OPERATOR_TYPE_USER = 0;
- /**鎿嶄綔浜虹被鍨�-鍛樺伐*/
- public static final int OPERATOR_TYPE_EMPLOYEE = 1;
- /**鎿嶄綔浜虹被鍨�-绠＄悊鍛�*/
- public static final int OPERATOR_TYPE_ADMIN = 2;
/**鎿嶄綔浜虹被鍨�-绯荤粺*/
- public static final int OPERATOR_TYPE_SYSTEM = 3;
+ public static final int OPERATOR_TYPE_SYSTEM = 0;
+ /**鎿嶄綔浜虹被鍨�-绠＄悊鍛�*/
+ public static final int OPERATOR_TYPE_ADMIN = 1;
+ /**鎿嶄綔浜虹被鍨�-鐢ㄦ埛*/
+ public static final int OPERATOR_TYPE_USER = 2;
+ /**鎿嶄綔浜虹被鍨�-鍛樺伐*/
+ public static final int OPERATOR_TYPE_EMPLOYEE = 3;
+
/**鎿嶄綔绫诲瀷-绯荤粺澶勭悊*/
public static final int OP_TYPE_SYS = 0;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java
index 4d13c27..3db0288 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java
@@ -25,5 +25,17 @@
@PostMapping(value = "/order/detail")
Result orderDetail(@RequestParam("orderId") String orderId);
+ /**
+ * 鏍规嵁鍟嗗搧id鏌ヨ璁㈠崟鏁伴噺
+ */
+ @PostMapping(value = "/order/numByGoodsId")
+ Result queryOrderNumByGoodsId(@RequestParam("goodsId") String goodsId);
+
+ /**
+ * 鏍规嵁娲诲姩id鏌ヨ璁㈠崟鏁伴噺
+ */
+ @PostMapping(value = "/order/numByActivityId")
+ Result queryOrderNumByActivityId(@RequestParam("activityId") String activityId);
+
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java
index a2b5414..3b66134 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java
@@ -22,7 +22,7 @@
/**
* 寮�鏀惧钩鍙�-鐢ㄦ埛璧勪骇淇敼
*/
- @PostMapping(value = "/phip/user/money/unclaimed/add")
+ @PostMapping(value = "/user/money/unclaimed/add")
Result userMoneyUpdate(@RequestBody UserMoneyUpdateDto userMoneyUpdateDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncProjectService.java
index 8b02b47..ea00b85 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncProjectService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncProjectService.java
@@ -27,4 +27,12 @@
*/
@GetMapping(value = "/sync/project/update/service/tree")
Result updateServiceTree(@RequestBody JSONObject jsonObject);
+
+ /**
+ * 鍚屾his鐢ㄦ埛鍙垝鎵ｇ殑鏁版嵁
+ * @param jsonObject 鍙傛暟
+ * @return 杩斿洖
+ */
+ @GetMapping(value = "/sync/executionRecord/executable")
+ Result syncExecutionRecord(@RequestBody JSONObject jsonObject);
}
--
Gitblit v1.8.0