From 93e2629252f8ccaf94fe571a1496acfb3087a058 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 03 四月 2023 19:02:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new-合并账号
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/tmk/SPhipTmkContactService.java | 21 +++++++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java | 2
phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java | 4 +
phis-feign/src/main/java/com/hz/his/dto/order/OrderInitVo.java | 6 ++
phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java | 2
phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java | 2
phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeRoleDto.java | 2
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java | 8 ++
phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java | 18 ++++-
phis-feign/src/main/java/com/hz/his/dto/user/project/DirectCannelVo.java | 4 +
phis-feign/src/main/java/com/hz/his/dto/PageDto.java | 5 +
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java | 5 +
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 53 ++++++++---------
13 files changed, 96 insertions(+), 36 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/PageDto.java b/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
index 178bccd..adb4238 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
@@ -1,10 +1,15 @@
package com.hz.his.dto;
+import lombok.Data;
+
/**
* @author ChenJiaHe
* 鍒嗛〉鎵╁睍绫�*/
+@Data
public class PageDto {
+ /**鏍囪瘑*/
+ private String id;
/**褰撳墠椤垫暟*/
private Integer pageNum;
/**褰撳墠椤垫樉绀烘潯鏁�*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
index 92423d0..b912564 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
@@ -31,4 +31,6 @@
public static String TYPE_COMMON_GIFT = "gift";
/**鍏叡鏍囪瘑绫诲瀷,钀ラ攢浼樻儬鍒�*/
public static String TYPE_COMMON_MARKE = "marketing";
+ //涓夊叓濡囧コ鑺傞鍙栦紭鎯犲埜
+ public static final String TYPE_COMMON_QUEEN_DAY = "queen_day";
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java
index 7bc4cb5..b96afca 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java
@@ -15,6 +15,10 @@
private String updateTime;
/**鍛樺伐浼佷笟userId*/
private String userId;
+ /**瑙掕壊鍞竴瀛楃涓�*/
+ private String uniqueStr;
+ /**棰勭害闂ㄥ簵鏍囪瘑*/
+ private String shopId;
/**鍛樺伐瑙掕壊鍞竴鏍囪瘑鏁扮粍*/
private List<String> roleList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeRoleDto.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeRoleDto.java
index 471445d..9db529b 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeRoleDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeRoleDto.java
@@ -21,4 +21,6 @@
private String roleId;
/**瑙掕壊琛ㄦ爣璇�*/
private String roleTypeId;
+ /**鏄惁鍚岄棬搴�*/
+ private Integer isSameShop;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderInitVo.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderInitVo.java
index 64b287b..e1a92cb 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderInitVo.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderInitVo.java
@@ -11,4 +11,10 @@
/**璁㈠崟鏍囪瘑*/
private String orderId;
+ public OrderInitVo() {
+ }
+
+ public OrderInitVo(String orderId) {
+ this.orderId = orderId;
+ }
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
index 6dcb6bb..d1ffe6b 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
@@ -18,15 +18,19 @@
private String type;
/** 鍟嗗搧鍚嶇О */
private String goodsName;
- /** 瀹為��鏁� */
+ /** 瀹為��鏁帮紙瀹㈡埛濉啓锛� */
private Integer refundNum;
- /** 瀹為��閲戦 */
+ /** 瀹為��閲戦 锛堝鎴峰～鍐欙級*/
private BigDecimal refundMoney;
/** 閫�娆惧師鍥狅紙鍛樺伐锛� */
private String remarks;
/** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
private String refundReason;
+ /////鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻
+ /** 鍙��鎬婚噾棰�*/
+ private BigDecimal approveRefundTotal = BigDecimal.ZERO;
+
/** 閫�娆句簩绾у瓙璁㈠崟淇℃伅闆嗗悎 */
private List<OrderItemSourceRefundDto> orderItemSourceRefundDtos;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
index 6180767..bb27487 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
@@ -25,4 +25,9 @@
private String remarks;
/** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
private String refundReason;
+
+ /////鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻
+ /** 鍙��鎬婚噾棰�*/
+ private BigDecimal approveRefundTotal = BigDecimal.ZERO;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java
index 820864b..a03f7ad 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java
@@ -11,12 +11,17 @@
@Data
public class OrderPayMethodDto {
- /** 鏀粯鏂瑰紡缂栫爜 */
+ /** 鍙��鏀粯鏂瑰紡缂栫爜 */
private String payMethodNo;
- /** 鏀粯鏂瑰紡鍚嶇О */
+ /** 鍙��鏀粯鏂瑰紡鍚嶇О */
private String payMethodName;
- /** 鏀粯閲戦 */
+ /** 鍙��鏀粯閲戦 */
private BigDecimal payTotal;
+ /**鏄惁鐜伴噾鏀粯 0鍚�1鏄�*/
+ private Integer isMoneyPay;
+ /**鏄惁鍒掓墸璁＄畻锛�0鍚�1鏄�*/
+ private Integer isExecute;
+
/** 杞崲鏂瑰紡缂栫爜 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級 */
private String refundNumberNo;
/** 杞崲鏂瑰紡鍚嶇О 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級*/
@@ -31,8 +36,11 @@
public OrderPayMethodDto() {
}
- public OrderPayMethodDto(String payMethodNo, BigDecimal money) {
+ public OrderPayMethodDto(String payMethodNo, String payMethodName, BigDecimal payTotal,Integer isMoneyPay,Integer isExecute) {
this.payMethodNo = payMethodNo;
- this.money = money;
+ this.payMethodName = payMethodName;
+ this.payTotal = payTotal;
+ this.isMoneyPay = isMoneyPay;
+ this.isExecute = isExecute;
}
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
index 6ce4870..1e89f21 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
@@ -12,49 +12,48 @@
@Data
public class OrderRefundDto {
+ /** 璁㈠崟id */
+ private String orderId;
+ /** 閫�娆剧被鍨�(0:鍏ㄩ儴閫�娆�,1:閮ㄥ垎閫�娆�) */
+ private Integer refundOperationType;
+ /** 閫�娆句俊鎭泦鍚� */
+ private List<OrderItemRefundDto> refundList;
/** 閫�娆炬柟寮忛泦鍚� */
private List<OrderPayMethodDto> refundPayMethod;
+ /** 閫�娆句紭鎯犲埜淇℃伅闆嗗悎 蹇呭～ */
+ private List<OrderCouponRefunDto> couponList;
/** 閫�娆惧娉紙鍛樺伐锛� */
private String remarks;
/** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
private String refundReason;
- /** 閫�娆句俊鎭泦鍚� */
- private List<OrderItemRefundDto> refundList;
- /** 璁㈠崟id */
- private String orderId;
- /** 閫�娆剧被鍨�(0:閫�娆℃暟閫�娆�,1:浠呴��娆� 榛樿:0) */
- private Integer refundType;
- /** 鎿嶄綔浜篿d */
+
+ /** 鎿嶄綔浜哄憳宸ユ爣璇�*/
private String operatorId;
-
- //鎬昏鍗曢寤烘爣璇�
- private String hisOrderId;
-
- //闈炲繀濉� 閲嶅彂鏍囪瘑
- private String resendRecordId;
-
- /** 閫�娆鹃噾棰� */
- private BigDecimal totalAmount;
- /** 閫�娆句俊鎭泦鍚� 蹇呭～ */
- private List<OrderCouponRefunDto> couponList;
- /** 鎿嶄綔浜鸿鑹瞚d 蹇呭～*/
+ /** 鎿嶄綔浜哄憳宸ヨ鑹叉爣璇�-蹇呭～*/
private String roleId;
+
/** 鏄惁闇�瑕佸鎵� (0鍚� 1鏄�) 蹇呭～*/
private Integer isApproval;
-
/** 鏄惁鑷姩鐢熸垚閫�娆惧崟 (0鍚� 1鏄�) 蹇呭～*/
private Integer isRefund;
- /** 閫�娆剧被鍨�(0:鍏ㄩ儴閫�娆�,1:閮ㄥ垎閫�娆�) */
- private Integer refundOperationType;
+ //////绯荤粺鍙傛暟
+ /** 鍙��娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
+ private BigDecimal totalAmount;
+ /** 閫夋嫨閫�娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
+ private BigDecimal refundTotal;
+ /** 鍙��娆炬柟寮忛泦鍚� */
+ private List<OrderPayMethodDto> payMethodList;
+ /** 鍙��娆句紭鎯犲埜淇℃伅闆嗗悎 */
+ private List<OrderCouponRefunDto> payCouponList;
/** 骞冲彴鏉ユ簮 鍥犱负鏄痟is鍔╂墜鍙栨秷璁㈠崟鐨勮瘽灏辫鑷姩纭閫�娆惧崟 蹇呭～*/
private Integer platformSource;
- /**his鍔╂墜*/
- public static Integer HIS_ASSISTANT = 0;
-
- /**his鍚庡彴*/
- public static Integer HIS_BACKSTAGE = 1;
+ /**澶囩敤鍙傛暟*/
+ //鎬昏鍗曢寤烘爣璇�
+ private String hisOrderId;
+ //闈炲繀濉� 閲嶅彂鏍囪瘑
+ private String resendRecordId;
}
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 9e9e894..aaf032b 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
@@ -19,6 +19,8 @@
private String tel;
/**鎵�灞為棬搴楁爣璇�*/
private String shopId;
+ /**鎵�灞為【闂爣璇�*/
+ private String hisCorpUserId;
/**鎵�灞為【闂悕绉�*/
private String beCorpUser;
/**鏄惁鏌ヨ鎵�灞為【闂俊鎭�:0鍚�1鏄�*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/project/DirectCannelVo.java b/phis-feign/src/main/java/com/hz/his/dto/user/project/DirectCannelVo.java
index 3092e43..cc93828 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/project/DirectCannelVo.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/project/DirectCannelVo.java
@@ -2,6 +2,8 @@
import lombok.Data;
+import java.math.BigDecimal;
+
@Data
public class DirectCannelVo {
@@ -12,7 +14,7 @@
/**鎿嶄綔鐤楃▼鏁�*/
private Integer operateNum;
/**鎿嶄綔鍒掓墸閲戦*/
- private Integer deductionTotal;
+ private BigDecimal deductionTotal;
/**鎿嶄綔闂ㄥ簵鏍囪瘑锛堝簾寮冿級*/
private String shopId;
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 4bdf4f6..270b09c 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
@@ -64,7 +64,7 @@
@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/platform/tmk/SPhipTmkContactService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/tmk/SPhipTmkContactService.java
new file mode 100644
index 0000000..f5e4f6b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/tmk/SPhipTmkContactService.java
@@ -0,0 +1,21 @@
+package com.hz.his.feign.service.platform.tmk;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.activity.ActivityDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-tmk-contact")
+public interface SPhipTmkContactService {
+
+ /**
+ * 寮�鏀惧钩鍙�-鏌ヨ娲诲姩瑙勫垯鍒楄〃(甯﹀垎椤�)
+ */
+ @PostMapping(value = "/tmk_contact/add")
+ Result add (@RequestBody com.hz.his.dto.user.UserDto dto);
+
+}
\ No newline at end of file
--
Gitblit v1.8.0