From b59b211fbd8e16d14b7ba62ca8360a76db197780 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期四, 16 二月 2023 15:55:54 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java |   30 ++++++++++
 phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java                                  |   12 ++--
 phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java                                        |   11 +++
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java                     |    4 +
 phis-feign/src/main/java/com/hz/phis/dt/reward/RewardRecordDto.java                              |   28 +++++++++
 phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java                                        |   31 ++++++----
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SMeiJiService.java                        |   22 +++++++
 7 files changed, 118 insertions(+), 20 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
index 9e8f49c..bc5dfb3 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
@@ -14,16 +14,16 @@
  */
 @Data
 public class OrderPHisDto extends PageDto {
-    //type:0:鑽夌 1:鍒涘缓璁㈠崟 2:鍒涘缓璁㈠崟+缁撹处(鐩墠缁撹处鍜屽垱寤烘槸鍒嗗紑鐨�),crm濉�2锛屽繀濉�
+    /**0:鑽夌 1:鍒涘缓璁㈠崟 2:鍒涘缓璁㈠崟+缁撹处(鐩墠缁撹处鍜屽垱寤烘槸鍒嗗紑鐨�),crm濉�2锛屽繀濉�*/
     private String type;
-    //鎿嶄綔浜篿d(褰撳墠鐧诲綍浜虹殑鏍囪瘑),鑾峰彇褰撳墠鐧诲綍浜烘爣璇�,crm濉敤鎴凤紝蹇呭~
+    /**鎿嶄綔浜篿d(褰撳墠鐧诲綍浜虹殑鏍囪瘑),鑾峰彇褰撳墠鐧诲綍浜烘爣璇�,crm濉敤鎴凤紝蹇呭~*/
     private String operatorId;
-    //鎿嶄綔浜洪棬搴楁爣璇嗭紝蹇呭~
+    /**鎿嶄綔浜洪棬搴楁爣璇嗭紝蹇呭~*/
     private String shopId;
-    //鎬昏鍗曚俊鎭紝蹇呭~
+    /**鎬昏鍗曚俊鎭紝蹇呭~*/
     private OrdersPHisTotalDto orderTotal;
-    //涓�绾у瓙璁㈠崟锛屽繀濉�
+    /**涓�绾у瓙璁㈠崟锛屽繀濉�*/
     private List<OrderItemPHisDto> orderItem;
-    //寮�鍙戜汉闆嗗悎 闈炲繀濉�
+    /**寮�鍙戜汉闆嗗悎 闈炲繀濉�*/
     private List<OrderDeveloperDto> orderDeveloper;
 }
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
index 15ae1f3..3610f04 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
@@ -13,26 +13,31 @@
  */
 @Data
 public class PayDto {
-    //蹇呭~ 鏄惁鏄寜椤圭洰浠樻,0:鍚�,1:鏄�,榛樿:0
+    /**蹇呭~ 鏄惁鏄寜椤圭洰浠樻,0:鍚�,1:鏄�,榛樿:0*/
     private Integer type;
-    //蹇呭~ 璁㈠崟id
+    /**蹇呭~ 璁㈠崟id*/
     private String orderId;
-    //蹇呭~ 搴斾粯鎬婚噾棰�
+    /**蹇呭~ 搴斾粯鎬婚噾棰�*/
     private String total;
-    //蹇呭~ 缁撹处鍙傛暟
+    /**蹇呭~ 缁撹处鍙傛暟*/
     private List<PayAmountDto> amount;
-    //蹇呭~ 鎿嶄綔浜烘爣璇�,crm濉敤鎴�
+    /**蹇呭~ 鎿嶄綔浜烘爣璇�,crm濉敤鎴�*/
     private String operatorId;
 
-    //闈炲繀濉� 浼樻儬鍒竔d
-    private String userCouponId;
-    //闈炲繀濉� 璁㈠崟棰嗗缓鏍囪瘑
-    private String hisOrderId;
+    /**鏀粯鐢ㄦ埛*/
+    private String payUserId;
 
-    //闈炲繀濉� 浼樻儬鍒竔d闆嗗悎
-    private List<String> userCouponIds;
-    //闈炲繀濉� 鏀堕摱鍛榠d
+    /**闈炲繀濉� 浼樻儬鍒竔d*/
+    private String userCouponId;
+
+    /**闈炲繀濉� 璁㈠崟棰嗗缓鏍囪瘑*/
+    private String hisOrderId;
+    /**闈炲繀濉� 鏀堕摱鍛榠d*/
     private String cashier;
-    //闈炲繀濉� 鏀堕摱鍛橀棬搴�
+
+    /**闈炲繀濉� 鏀堕摱鍛橀棬搴�*/
     private String cashierShopId;
+
+    /**闈炲繀濉� 浼樻儬鍒竔d闆嗗悎*/
+    private List<String> userCouponIds;
 }
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
index 8e69929..9e9e894 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -7,8 +7,9 @@
 /**鏌ヨ鐢ㄦ埛璇︽儏鏁版嵁*/
 @Data
 public class UserDto extends PageDto {
-
+    /**鏍囪瘑*/
     private String id;
+    /**鐢ㄦ埛鏍囪瘑*/
     private String userId;
     /**ciq*/
     private String CIQ;
@@ -20,4 +21,12 @@
     private String shopId;
     /**鎵�灞為【闂悕绉�*/
     private String beCorpUser;
+    /**鏄惁鏌ヨ鎵�灞為【闂俊鎭�:0鍚�1鏄�*/
+    private Integer isSelectCorp;
+    /**鏄惁鏌ヨ鎵�灞為棬搴椾俊鎭�:0鍚�1鏄�*/
+    private Integer isSelectShop;
+    /**鏄惁鏈夐棬搴�*/
+    private Integer isHaveShop;
+    /**鏄惁鏈夐【闂�*/
+    private Integer isHaveCorp;
 }
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
index 7f1e96e..4bdf4f6 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
@@ -5,6 +5,7 @@
 import com.hz.his.dto.employee.EmpDocDto;
 import com.hz.his.dto.TimeDto;
 import com.hz.his.dto.employee.EmployeeDto;
+import com.hz.his.dto.employee.EmployeeRoleDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -63,5 +64,8 @@
     @PostMapping(value = "/emp/role/liset")
     Result roleList(@RequestBody(required = false) EmployeeDto employeeDto);
 
+    /**鍛樺伐-瑙掕壊鍒楄〃*/
+    @PostMapping(value = "/emp/role/info/list")
+    Result employeeRoleList(@RequestBody(required = false) EmployeeRoleDto employeeRoleDto);
 
 }
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SMeiJiService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SMeiJiService.java
new file mode 100644
index 0000000..05fa958
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SMeiJiService.java
@@ -0,0 +1,22 @@
+package com.hz.his.feign.service.phis;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.order.OrderDto;
+import com.hz.his.dto.user.UserDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
+ */
+@FeignClient(name = "phis-provider", path = "/p-his-data", contextId = "meiji")
+public interface SMeiJiService {
+
+    /**
+     * 璁㈠崟鍒楄〃
+     */
+    @PostMapping(value = "/meiji/userSkinReportList")
+    Result userSkinReportList(@RequestBody UserDto userDto);
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java
new file mode 100644
index 0000000..f347f17
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java
@@ -0,0 +1,30 @@
+package com.hz.his.feign.service.platform.questionnaire;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.activity.ActivityDto;
+import com.hz.phis.dt.reward.RewardRecordDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-reward")
+public interface SPhipRewardService {
+
+    /**
+     * 鏌ヨ鎵撹祻鍟嗗搧
+     */
+    @PostMapping(value = "/questionnaire/reward-goods/list")
+    Result rewardGoodsList();
+
+
+    /**
+     * 鎵撹祻
+     */
+    @PostMapping(value = "/questionnaire/reward")
+    Result reward(RewardRecordDto recordDto);
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/reward/RewardRecordDto.java b/phis-feign/src/main/java/com/hz/phis/dt/reward/RewardRecordDto.java
new file mode 100644
index 0000000..7803dac
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/reward/RewardRecordDto.java
@@ -0,0 +1,28 @@
+package com.hz.phis.dt.reward;
+
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class RewardRecordDto {
+
+    private String goodsName;
+
+    private String goodsId;
+
+    private String employeeId;
+
+    private Integer deduIntegral;
+
+    private Integer number;
+
+    private Integer type;
+
+    private String commonId;
+
+    private String userId;
+
+    private List<RewardRecordDto> recordDtoList;
+}

--
Gitblit v1.8.0