From 10121f70218d5af50e68f343c18044073bd6d9ce Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 03 七月 2023 17:12:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java | 2
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorPerfService.java | 11
phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java | 33 ++
phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java | 8
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java | 5
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 14
phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java | 7
phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java | 31 +
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 36 ++
phis-feign/src/main/java/com/hz/his/vo/cos/OssRecoverVO.java | 25 +
phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java | 25 +
phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java | 2
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java | 11
phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java | 15
phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java | 8
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java | 5
phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java | 10
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 2
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java | 19
phis-feign/src/main/java/com/hz/his/feign/service/platform/refund/SCardRefundService.java | 30 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiNursePerfService.java | 12
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java | 6
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantPerfService.java | 11
phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java | 7
phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java | 2
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTmkPerfService.java | 14
phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java | 12
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 11
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java | 4
phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java | 2
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMpQrCodeService.java | 20 +
phis-feign/src/main/java/com/hz/his/dto/mp/MpQrCodeDto.java | 30 +
phis-feign/src/main/java/com/hz/his/dto/shop/ShopVo.java | 60 +++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 8
phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java | 9
phis-feign/src/main/java/com/hz/his/dto/report/TmkOrderPerfReqDto.java | 4
phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalItemDto.java | 24 +
phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalDto.java | 24 +
phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java | 17 +
phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java | 6
phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java | 66 ++++
phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java | 8
phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java | 40 ++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantCashService.java | 3
phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java | 9
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java | 11
phis-feign/src/main/java/com/hz/his/dto/coupon/OrderSendCouponDto.java | 44 ++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiClinicPerfService.java | 4
phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeVo.java | 75 ++++
phis-feign/src/main/java/com/hz/his/dto/file/FileSignReturnVo.java | 13
phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java | 7
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java | 15
phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPayMarketingDto.java | 23 +
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 2
54 files changed, 885 insertions(+), 17 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java
index 8f954ae..8eb208c 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java
@@ -32,6 +32,8 @@
List<AppearanceLabelDto> labelDtoList;
/**棰滃�艰鍒欏浘鐗囧垪琛�*/
List<AppearancePictureDto> pictureDtoList;
+ /** 鍒拌璁㈠崟id(闂ㄥ簵鍔╂墜浣跨敤缁熻浣跨敤) */
+ private String visitOrderId;
public AppearanceDto() {
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
index b3ea858..d9e6954 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
@@ -4,6 +4,8 @@
import com.hz.his.dto.PageDto;
import lombok.Data;
+
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -18,6 +20,8 @@
private String operatorId;
/**鎿嶄綔浜哄悕绉�*/
private String operatorName;
+ /**鎿嶄綔浜虹被鍨�*/
+ private Integer operatorType;
/**娲诲姩鏍囪瘑*/
private String groupBuyId;
private String id;
@@ -38,4 +42,11 @@
/*鐢ㄦ埛浼樻儬鍒�*/
private String couponNumberId;
+
+
+ //寮�鍗曠粨璐︿竴璧锋墽琛屾牎楠屼紭鎯犲埜鎺ュ彛浣跨敤鍙傛暟
+ /** 浼樻儬鍒稿晢鍝丣SON鏁扮粍瀛楃 */
+ private String couponGoodsArr;
+ /** 璁㈠崟搴斾粯閲戦 */
+ private BigDecimal shouldTotal;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java
index 8402cc6..d2c7327 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java
@@ -11,8 +11,17 @@
/**浼樻儬鍒告爣璇�*/
private String couponId;
-
/**鏁伴噺*/
private Integer num;
+ //澶氫紭鎯犲埜鍙戞斁鏃朵娇鐢ㄥ瓧娈�
+ /**鎵规鍙峰悕绉�*/
+ private String recordName;
+ /**鍏叡鏍囪瘑*/
+ private String commonId;
+ /**鍏叡瀛愭爣璇�*/
+ private String commonItemId;
+ /**鍏叡绫诲瀷(CouponRecordDto)*/
+ private String commonType;
+
}
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 a76c56d..82af4b1 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
@@ -16,6 +16,8 @@
private String recordName;
/**鍏叡鏍囪瘑*/
private String commonId;
+ /**鍏叡瀛愭爣璇�*/
+ private String commonItemId;
/**鍏叡绫诲瀷*/
private String commonType;
@@ -35,4 +37,6 @@
public static final String TYPE_COMMON_QUEEN_DAY = "queen_day";
/**鍏叡鏍囪瘑绫诲瀷,crm鍟嗗搧璇︽儏棰嗗彇浼樻儬鍒�*/
public static final String TYPE_COMMON_GOODS_DETAILS = "goods_details";
+ /**鍏叡鏍囪瘑绫诲瀷,璁㈠崟璐拱浼樻儬鍒�*/
+ public static final String TYPE_COMMON_ORDER = "order";
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/OrderSendCouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/OrderSendCouponDto.java
new file mode 100644
index 0000000..8c33864
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/OrderSendCouponDto.java
@@ -0,0 +1,44 @@
+package com.hz.his.dto.coupon;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 璁㈠崟鍙戞斁浼樻儬鍒竏to
+ * @USER: fhx
+ * @DATE: 2023/6/27
+ **/
+@Data
+public class OrderSendCouponDto {
+
+ /**鐢ㄦ埛淇℃伅*/
+ UserArrDto userArrDto;
+
+ /** 浼樻儬鍒镐俊鎭垪琛� */
+ private List<CouponItemDto> itemDtoList;
+
+ /**鏉ユ簮缂栫爜,鍟嗘埛鑷畾涔夋湇鍔℃潵婧愭爣璇�*/
+ private String appIdCode;
+ /**鎿嶄綔浜烘爣璇�*/
+ private String operatorId;
+ /**鎿嶄綔浜哄悕绉�*/
+ private String operatorName;
+ /**鎿嶄綔浜虹被鍨�*/
+ private Integer operatorType;
+
+
+ //--------------------------------------------------------------------
+ //瀵瑰簲phis琛–ouponReleaseRecord甯搁噺
+ /**鎿嶄綔浜虹被鍨�-鍛樺伐*/
+ public static Integer OPERATOR_TYPE_EMPLOYEES = 0;
+ /**鎿嶄綔浜虹被鍨�-绠＄悊鍛�*/
+ public static Integer OPERATOR_TYPE_ADMIN = 1;
+ /**鎿嶄綔浜虹被鍨�-鐢ㄦ埛鑷*/
+ public static Integer OPERATOR_TYPE_USER = 2;
+ /**鎿嶄綔浜虹被鍨�-绯荤粺*/
+ public static Integer OPERATOR_TYPE_SYSTEM = 3;
+ /**鎿嶄綔浜虹被鍨�-鐢ㄦ埛璁㈠崟璐拱*/
+ public static Integer OPERATOR_TYPE_USER_ORDER = 4;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeVo.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeVo.java
new file mode 100644
index 0000000..a682a4a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeVo.java
@@ -0,0 +1,75 @@
+package com.hz.his.dto.employee;
+
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Index;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Table;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Unique;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *
+ * 鍛樺伐
+ * author:fhx
+ * Date:2021/8/4 17:35
+ */
+
+@Data
+public class EmployeeVo {
+
+ private String id;
+ private String unionId;
+
+ private String userId;
+
+ private String cnName;
+
+ private String enName;
+
+ private String tel;
+
+ private String email;
+
+ private String imgUrl;
+
+ private String apiId;
+
+ private Integer isJob;
+
+ private Integer gender ;
+
+ private String employeeNo;
+
+ private String roleId;
+
+ private Integer isSyncRole;
+ private String idCard;
+ private String birthday;
+ private String degree;
+ private String certificateNo;
+ private String password;
+ private Integer isPerformanceEmp;
+ private String cardId;
+
+ //sql璇彞杩斿洖浣跨敤瀛楁
+ private String shopId;
+ private String shopName;
+ private String shopHisId;
+ private String roleName;
+ private String roleStr;
+ private String roleTypeId;
+ private String adminRoleId;
+ //鐧诲綍瑙掕壊id
+ private String loginRoleId;
+
+ // 鍏宠仈鍚庡彴绠＄悊鍛榠d
+ private String adminId;
+ private String adminName;
+
+ public EmployeeVo() {
+ }
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/file/FileSignReturnVo.java b/phis-feign/src/main/java/com/hz/his/dto/file/FileSignReturnVo.java
new file mode 100644
index 0000000..5c7c17b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/file/FileSignReturnVo.java
@@ -0,0 +1,13 @@
+package com.hz.his.dto.file;
+
+import lombok.Data;
+
+/**鐢熸垚绛惧悕璁块棶URL
+ * @author CJH*/
+@Data
+public class FileSignReturnVo {
+
+ /**鏂囦欢璺緞*/
+ private String fileUrl;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java b/phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java
new file mode 100644
index 0000000..4403155
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java
@@ -0,0 +1,25 @@
+package com.hz.his.dto.file;
+
+import lombok.Data;
+
+/**鐢熸垚绛惧悕璁块棶URL
+ * @author CJH*/
+@Data
+public class FileSignVo {
+
+ /**鏂囦欢璺緞*/
+ private String fileUrl;
+ /**妗跺悕绉�-鍙笉浼�*/
+ private String bucketName;
+
+ private String fileName;
+
+ private String method;
+
+ public FileSignVo() {
+ }
+
+ public FileSignVo(String fileUrl) {
+ this.fileUrl = fileUrl;
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPayMarketingDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPayMarketingDto.java
new file mode 100644
index 0000000..49fc2f1
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPayMarketingDto.java
@@ -0,0 +1,23 @@
+package com.hz.his.dto.marketing;
+
+import com.hz.his.dto.order.OrdersTotalDto;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 钀ラ攢鍔╂墜璁㈠崟鏀粯鐢宠鍏ュ弬
+ * @author fwq
+ */
+@Data
+public class OrderPayMarketingDto extends MarketingDto{
+ /*******************蹇呭～椤�(娉ㄦ剰缁ф壙鐨勫叕鍏辩被MarketingDto)*************************/
+ /**璁㈠崟淇℃伅*/
+ private OrdersTotalDto ordersTotalDto;
+ /**璁㈠崟鎶樻墸(鍗曚綅:鐧惧垎姣�)*/
+ private BigDecimal discountNum;
+ /**璁㈠崟椤圭洰淇℃伅*/
+ private List<RefundProjectDto> projectDtoList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java
index 41682b1..d82b1c7 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java
@@ -17,4 +17,6 @@
private String projectName;
/**閫�鐨勬暟閲� 鍟嗗搧/椤圭洰/... - 蹇呭～*/
private Integer refundNum;
+ /**涔扮殑鏁伴噺 鍟嗗搧/椤圭洰/...*/
+ private Integer buyNum;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/mp/MpQrCodeDto.java b/phis-feign/src/main/java/com/hz/his/dto/mp/MpQrCodeDto.java
new file mode 100644
index 0000000..d58528a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/mp/MpQrCodeDto.java
@@ -0,0 +1,30 @@
+package com.hz.his.dto.mp;
+
+
+/**
+ * 灏忕▼搴忎簩缁寸爜dto
+ */
+public class MpQrCodeDto {
+
+ //ciq
+ private String ciq;
+
+ //闂ㄥ簵缂栧彿
+ private String shopCode;
+
+ public String getCiq() {
+ return ciq;
+ }
+
+ public void setCiq(String ciq) {
+ this.ciq = ciq;
+ }
+
+ public String getShopCode() {
+ return shopCode;
+ }
+
+ public void setShopCode(String shopCode) {
+ this.shopCode = shopCode;
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java
index 6b573f0..18878c6 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java
@@ -26,11 +26,15 @@
/** 骞冲彴鏉ユ簮 鍥犱负鏄痟is鍔╂墜鍙栨秷璁㈠崟鐨勮瘽灏辫鑷姩纭閫�娆惧崟 蹇呭～*/
private Integer platformSource;
- /**his鍔╂墜*/
- public static Integer HIS_ASSISTANT = 0;
+ /** 鍙栨秷璁㈠崟澶囨敞 */
+ private String remarks;
+ /**his鍔╂墜*/
+ public static final Integer HIS_ASSISTANT = 0;
/**his鍚庡彴*/
- public static Integer HIS_BACKSTAGE = 1;
+ public static final Integer HIS_BACKSTAGE = 1;
+ /**瀵煎尰*/
+ public static final Integer PHIS_GUIDE = 2;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalDto.java
new file mode 100644
index 0000000..ec8cf08
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalDto.java
@@ -0,0 +1,24 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 璁㈠崟璁＄畻搴斾粯閲戦
+ * @USER: fhx
+ * @DATE: 2023/6/13
+ **/
+@Data
+public class OrderCountShouldTotalDto {
+
+ //闂ㄥ簵id
+ private String shopId;
+ //鐢ㄦ埛浼樻儬鍒�
+ private String couponNumberId;
+ //璁㈠崟搴斾粯閲戦
+ private BigDecimal shouldTotal;
+ //鍟嗗搧item淇℃伅
+ private List<OrderCountShouldTotalItemDto> itemDtoList;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalItemDto.java
new file mode 100644
index 0000000..e336b12
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalItemDto.java
@@ -0,0 +1,24 @@
+package com.hz.his.dto.order;
+
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 璁㈠崟璁＄畻搴斾粯閲戦item淇℃伅
+ * @USER: fhx
+ * @DATE: 2023/6/13
+ **/
+@Data
+public class OrderCountShouldTotalItemDto {
+ //鍟嗗搧绫诲瀷
+ private String type;
+ //鍟嗗搧id
+ private String commonId;
+ //璐拱鏁伴噺
+ private Integer buyNum;
+ //璁㈠崟鎶樻墸
+ private BigDecimal discount = BigDecimal.ZERO;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
index caca455..2992a9f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
@@ -20,6 +20,8 @@
private BigDecimal total;
/**蹇呭～ 瀛愬崟鎬荤Н鍒嗭紝瀹炰粯绉垎(鏆傛椂鐢ㄤ笉涓�)*/
private BigDecimal totalIntegral;
+ /**闈炲繀濉� 瀛愬崟鎬荤Н鍒嗭紝寮�鍗曟椂搴斾粯鎬荤Н鍒�(CRM绉垎璁㈠崟鏃跺繀濉�)*/
+ private BigDecimal totalPoints;
/**闈炲繀濉� 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭～锛岄粯璁�100,涓嶄紶鍚庡彴榛樿100*/
private BigDecimal discount;
/**蹇呭～ 璐拱鏁伴噺 蹇呭～锛岄粯璁�0*/
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 1e89f21..e05dee0 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
@@ -40,6 +40,8 @@
//////绯荤粺鍙傛暟
/** 鍙��娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
private BigDecimal totalAmount;
+ /** 鍙��娆炬�荤Н鍒嗭紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
+ private BigDecimal totalIntegral;
/** 閫夋嫨閫�娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
private BigDecimal refundTotal;
/** 鍙��娆炬柟寮忛泦鍚� */
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
index 9234d13..60a9bc3 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
@@ -52,6 +52,8 @@
/**闈炲繀濉� 璁㈠崟娓犻亾鏉ユ簮鍚嶇О(娓犻亾/鐢ㄦ埛) */
private String commonName;
+ /**璁㈠崟鎺ㄨ崘浜虹被鍨�(UserChannelType)鍛樺伐鎴栬�呯敤鎴�,榛樿鐢ㄦ埛*/
+ private String inviteeType;
/**crm蹇呭～ 璁㈠崟鎺ㄨ崘浜烘爣璇�,涓夊皯璇达細crm蹇呭～ */
private String inviteeId;
/**闈炲繀濉� 璁㈠崟鎺ㄨ崘浜哄悕绉�(鍐椾綑),涓夊皯璇达細crm蹇呭～ 涓嶄紶,鍚庡彴澶勭悊*/
@@ -62,6 +64,9 @@
/**蹇呭～ 璁㈠崟鎬婚噾棰�(璁㈠崟绫诲瀷鏄厖鍊艰鍗曞繀濉�,鍚﹀垯闈炲繀濉�) */
private BigDecimal total;
+
+ /**闈炲繀濉� 璁㈠崟鎬荤Н鍒�(璁㈠崟绫诲瀷鏄Н鍒嗚鍗曞繀濉�,鍚﹀垯闈炲繀濉�) */
+ private BigDecimal totalPoints;
/**闈炲繀濉� 璁㈠崟鍏朵粬淇℃伅(娌℃湁鍚庡彴榛樿)*/
private OrderInfoDto orderInfo;
@@ -91,4 +96,7 @@
/**闈炲繀濉� 娲诲姩瑙勫垯鏍囪瘑闆嗗悎*/
private List<String> activityIds;
+
+ /** 娌荤枟鍗昳d */
+ private String treatSingleId;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
index 4e5fccc..a92147a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
@@ -22,4 +22,12 @@
private String cardEquityId;
/**闈炲繀濉� 鍗″寘鏍囪瘑:鍗￠」鏀粯蹇呬紶*/
private String userCardId;
+
+ /**
+ * 鏍囪瀛楁锛岄粯璁�0
+ * 鏀粯鏂瑰紡涓虹Н鍒嗘椂锛�
+ * isDel=100锛屽垯phis杩欒竟闇�瑕佹墸鍑忕敤鎴风Н鍒�
+ * isDel=101锛屽垯phis杩欒竟涓嶉渶瑕佹墸鍑忕敤鎴风Н鍒�
+ */
+ private Integer isDel = 0;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
index 12f1a2c..e324612 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
@@ -32,6 +32,8 @@
private String shopId;
/**瀹㈡埛鎵�灞為棬搴�*/
private String userShopId;
+ /**閿�鍞钩鍙�*/
+ private String sourceName;
/*******淇濆瓨鍙傛暟********/
/**鎿嶄綔浜烘爣璇�*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java
index cb909f0..27b5038 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java
@@ -14,6 +14,10 @@
private Date startTime;
/**寮�鍗曠粨鏉熸椂闂�*/
private Date endTime;
+ /**璁㈠崟鏀粯寮�濮�*/
+ private Date orderPayStartTime;
+ /**璁㈠崟鏀粯缁撴潫*/
+ private Date orderPayEndTime;
/**璁㈠崟鍙�*/
private String orderNo;
/**鎵�灞為棬搴�*/
@@ -24,6 +28,14 @@
private Integer deductionStatus;
/**椤圭洰鍒嗙被*/
private String typeId;
+ /**鍝侀」鍒嗙被*/
+ private String goodsClassify;
+ /**鏈堜唤鏃堕棿*/
+ private String monthTime;
+ /**鏈堜唤鏃堕棿寮�濮�*/
+ private String startMonthTime;
+ /**鏈堜唤鏃堕棿缁撴潫*/
+ private String endMonthTime;
/*******淇濆瓨鍙傛暟********/
/**鎿嶄綔浜烘爣璇�*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java
index b4851de..8a9270a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java
@@ -28,7 +28,10 @@
private String deductStartTime;
//鎵ц缁撴潫鏃堕棿
private String deductEndTime;
-
+ //涓氱哗寮�濮嬫椂闂�
+ private String startTime;
+ //涓氱哗缁撴潫鏃堕棿
+ private String endTime;
//鎵�灞為棬搴梚d
private String belongShopId;
//鏈嶅姟闂ㄥ簵id
@@ -84,4 +87,8 @@
private Integer sumIsShop = NO;
//姹囨�昏鑹�
private String sumRole;
+
+ //鎿嶄綔浜�
+ private String operatorId;
+ private String operatorName;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/TmkOrderPerfReqDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/TmkOrderPerfReqDto.java
index 7cdcddd..6416aed 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/TmkOrderPerfReqDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/TmkOrderPerfReqDto.java
@@ -22,4 +22,8 @@
private String chatCorpUserId;
//鍓嶇疆澶╂暟
private Integer leadDays;
+
+ //鎿嶄綔浜�
+ private String operatorId;
+ private String operatorName;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/shop/ShopVo.java b/phis-feign/src/main/java/com/hz/his/dto/shop/ShopVo.java
new file mode 100644
index 0000000..167c2c0
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/shop/ShopVo.java
@@ -0,0 +1,60 @@
+package com.hz.his.dto.shop;
+
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
+import lombok.Data;
+
+/**
+ * 闂ㄥ簵
+ */
+@Data
+public class ShopVo {
+
+ private String id;
+ private String code;
+
+ private String name;
+
+ private String institutionalCode;
+
+ private String departmentId;
+
+ private Integer corpMpDepId;
+
+ private Integer maxAppNum;
+
+ private Integer maxSwitchNum;
+
+ private Integer isUp;
+
+ private String workTime;
+
+ private String province;
+
+ private String city;
+
+ private String area;
+
+ private String addr;
+
+ private String colorStr;
+
+ private String doctorRelaxTime;
+
+ private String carWay;
+
+ private String subWay;
+
+ private String apiId;
+ private Integer shengMeiNum;
+ private Integer sameTimeCustomerNum;
+
+ private String clinicCode;
+ private String clinicName;
+
+ private Integer isPerformanceShop;
+
+ public ShopVo() {
+ }
+
+}
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 4dd2935..3768939 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
@@ -1,7 +1,11 @@
package com.hz.his.dto.user;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import com.hz.his.dto.PageDto;
import lombok.Data;
+
+import java.util.Date;
/**鏌ヨ鐢ㄦ埛璇︽儏鏁版嵁*/
@@ -35,4 +39,9 @@
private Integer isHaveShop;
/**鏄惁鏈夐【闂�*/
private Integer isHaveCorp;
+
+ private Date startTime;
+
+ private Date endTime;
+
}
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 d52c540..2574514 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
@@ -95,4 +95,6 @@
public static final String OPERATION_REASON_CHANGE = "changeGoods";
/**鎿嶄綔鏂瑰紡-鐢熸棩璧犻��*/
public static final String OPERATION_REASON_BIRTHDAY_GIFT = "birthdayGift";
+
+ public static final String OPERATION_REASON_GIFT_0701 = "bringNewUserGift_0701";
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java
index 523328a..02c2ae7 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java
@@ -4,6 +4,7 @@
import com.hz.his.dto.marketing.OrderCancelDto;
import com.hz.his.dto.marketing.OrderDiscountDto;
import com.hz.his.dto.marketing.OrderPartRefundDto;
+import com.hz.his.dto.marketing.OrderPayMarketingDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -34,4 +35,10 @@
@PostMapping(value = "/order/apply/part/refund")
Result applyPartRefund(@RequestBody OrderPartRefundDto orderPartRefundDto);
+ /**
+ * 璁㈠崟鏀粯鐢宠
+ */
+ @PostMapping(value = "/order/apply/order/pay")
+ Result orderPay(@RequestBody OrderPayMarketingDto orderPayMarketingDto);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java
index d745c62..57fef07 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java
@@ -35,4 +35,11 @@
*/
@PostMapping(value = "/consumables/update/list")
Result getUpdateConsumables(@RequestBody ConsumablesDto consumablesDto);
+
+ /**
+ * 鑾峰彇浼樻儬鍒稿晢鍝佸垪琛�
+ * @return Result
+ */
+ @PostMapping(value = "/consumables/coupon/list")
+ Result getConsumablesCouponList(@RequestBody PageDto pageDto);
}
\ No newline at end of file
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 270b09c..4e4d24a 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
@@ -68,4 +68,10 @@
@PostMapping(value = "/emp/role/info/list")
Result employeeRoleList(@RequestBody(required = false) EmployeeRoleDto employeeRoleDto);
+ @PostMapping(value = "/emp/check/doctor")
+ Result checkEmployeeRoleDoctor(@RequestBody(required = false) EmpDocDto employeeDto);
+
+ @PostMapping(value = "/emp/detail/name")
+ Result getDetailsByName(@RequestBody(required = false) EmpDocDto employeeDto);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
index ed9dc06..5a4670b 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.file.FileDownDto;
+import com.hz.his.dto.file.FileSignVo;
import feign.Response;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
@@ -46,4 +47,20 @@
@PostMapping(value = "/cos/download-file")
Response downloadFile(@RequestBody FileDownDto cosDownDto);
+ /**
+ *鐢熸垚绛惧悕璁块棶URL
+ * @param fileSignVo 瀵硅薄
+ * @return 浣跨敤FileSignReturnVo杞寲
+ */
+ @PostMapping(value = "/cos/signUrl")
+ Result signUrl(@RequestBody FileSignVo fileSignVo);
+
+ /**
+ *鐢熸垚涓婁紶绛惧悕
+ * @param fileSignVo 瀵硅薄
+ * @return 浣跨敤FileSignReturnVo杞寲
+ */
+ @PostMapping(value = "/cos/policy")
+ Result policy(@RequestBody FileSignVo fileSignVo);
+
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java
index 4321960..d83a8de 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java
@@ -36,4 +36,19 @@
*/
@PostMapping(value = "/shop/list")
Result getList(@RequestBody TimeDto timeDto);
+
+
+ /**
+ * 鑾峰彇闂ㄥ簵璇︽儏杩斿洖vo
+ * @return Result
+ */
+ @PostMapping(value = "/shop/detail/vo")
+ Result getShopDetailVo(@RequestBody ShopDto shopDto);
+
+ /**
+ * 鑾峰彇闂ㄥ簵璇︽儏杩斿洖vo
+ * @return Result
+ */
+ @PostMapping(value = "/shop/detail/name")
+ Result getDetailByName(@RequestBody ShopDto shopDto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index 504fa58..ab4bd11 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -283,4 +283,40 @@
* */
@PostMapping(value = "/user/next/level")
Result nextLevel(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ绱杩斾剑
+ * */
+ @PostMapping(value = "/user/query/rebate")
+ Result queryRebate(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛棣栧ぉ娑堣垂绱
+ * */
+ @PostMapping(value = "/user/first/day/consumption")
+ Result firstDayConsumption(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛棣栧ぉ娑堣垂绱
+ * */
+ @PostMapping(value = "/user/accumulat/consumption")
+ Result accumulateConsumption(@RequestBody UserDto userDto);
+
+ /**
+ * 鍒ゆ柇鐢ㄦ埛鏄惁涓哄啀鍗囩編瀛︿細鍛橈紙鏄惁鏈夎喘涔板啀鍗囩編瀛﹀崱椤硅鍗曪級
+ * */
+ @PostMapping(value = "/user/check/upgraded/aesthetics")
+ Result checkUpgradedAesthetics(@RequestBody UserDto userDto);
+
+ /**
+ * 鍒ゆ柇鐢ㄦ埛鏄惁涓哄啀鍗囩編瀛︿細鍛橈紙鏄惁鏈夎喘涔板啀鍗囩編瀛﹀崱椤硅鍗曪級
+ * */
+ @PostMapping(value = "/user/check/consumption")
+ Result checkConsumption(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛绱杩斾剑
+ * */
+ @PostMapping(value = "/user/rebate/userId")
+ Result queryRebateByUserId(@RequestBody UserDto userDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
index edd3c19..9364e5f 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.coupon.CouponDto;
+import com.hz.his.dto.coupon.OrderSendCouponDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -49,4 +50,18 @@
*/
@PostMapping(value = "/coupon/check/coupon")
Result checkCoupon(@RequestBody CouponDto couponDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-妫�鏌ヤ紭鎯犲埜鏄惁鍙敤 - 寮�鍗曠粨璐﹀悓鏃舵墽琛屼娇鐢�
+ */
+ @PostMapping(value = "/coupon/check/coupon/to/orderAndPay")
+ Result checkCouponToOrderAndPay(@RequestBody CouponDto couponDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-璁㈠崟鍙戞斁浼樻儬鍒�
+ */
+ @PostMapping(value = "/coupon/order/send/coupon")
+ Result orderSendCoupon(@RequestBody OrderSendCouponDto couponDto);
+
+
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMpQrCodeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMpQrCodeService.java
new file mode 100644
index 0000000..8d6e743
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMpQrCodeService.java
@@ -0,0 +1,20 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.mp.MpQrCodeDto;
+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-qrcode")
+public interface SPhipMpQrCodeService {
+
+ /**
+ * 寮�鏀惧钩鍙�- 鐢ㄦ埛鎵爜鐧昏妯″潡 娉ㄥ唽缁戝畾鍚庡垱寤篽is鍔╂墜灏忕▼搴忕爜(MpQrCodeController-userTempVisitQrCode鏂规硶)
+ */
+ @PostMapping(value = "/mp/qrcode/user/temp/visit/qrcode")
+ Result userTempVisitQrCode(@RequestBody MpQrCodeDto mpQrCodeDto);
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
index 13b20dc..970d425 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
@@ -106,6 +106,12 @@
Result marketingAduit(@RequestBody AduitDto dto);
/**
+ * 寮�鏀惧钩鍙�-钀ラ攢鍔╂墜璁㈠崟鏀粯瀹℃牳閫氳繃/鎷掔粷鎺ュ彛
+ */
+ @PostMapping(value = "/audit/marketing/aduit/pay")
+ Result marketingAduitPay(@RequestBody AduitDto dto);
+
+ /**
* 寮�鏀惧钩鍙�-钀ラ攢鍔╂墜璁㈠崟鍙栨秷瀹℃牳閫氳繃/鎷掔粷鎺ュ彛
*/
@PostMapping(value = "/audit/order/cancel")
@@ -173,4 +179,12 @@
@PostMapping(value = "/order/refund/cancel")
Result refundCancel(@RequestBody RefundCancelVo refundCancelVo);
+
+ /**
+ * 璁＄畻璁㈠崟搴斾粯閲戦
+ */
+ @PostMapping(value = "/order/countOrderShouldTotal")
+ Result countOrderShouldTotal(@RequestBody OrderCountShouldTotalDto dto);
+
+
}
\ 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 a76d5a6..743ccb4 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
@@ -32,4 +32,15 @@
@PostMapping(value = "/user/money/info")
Result userMoneyInfo(@RequestBody UserMoneyDto userMoneyDto);
+ /**
+ * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勯噾鏉ユ簮淇℃伅(鏃ュ織娑堟伅鏌ヨ)
+ */
+ @PostMapping(value = "/user/money/log/source/info")
+ Result userMoneyLogSourceInfo(@RequestBody UserMoneyDto userMoneyDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勯噾浣跨敤淇℃伅(鏃ュ織娑堟伅鏌ヨ)
+ */
+ @PostMapping(value = "/user/money/log/use/info")
+ Result userMoneyLogUseInfo(@RequestBody UserMoneyDto userMoneyDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
index a1816d4..e967991 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -96,4 +96,12 @@
*/
@PostMapping(value = "/user/families/room/info/update")
Result updateUserFamiliesRoomInfo(@RequestBody UserParamDto userParamDto);
+
+
+
+ /**
+ * 寮�鏀惧钩鍙�-鐢ㄦ埛绛夌骇閲嶆柊璁＄畻
+ */
+ @PostMapping(value = "/user/level/calc")
+ Result userLevelCalc(@RequestBody UserParamDto userParamDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiClinicPerfService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiClinicPerfService.java
index f8f0c55..d4d71a6 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiClinicPerfService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiClinicPerfService.java
@@ -38,7 +38,9 @@
@PostMapping("/admin/clinic/perf/cashierDetailList")
Result cashierDetailList(@RequestBody ClinicPerfReqDto reqDto);
-
+ /** 瀵煎嚭 - 鏀堕摱璇︾粏鍒楄〃 */
+ @PostMapping("/admin/clinic/perf/exportCashierDetail")
+ Result exportCashierDetail(@RequestBody ClinicPerfReqDto reqDto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantCashService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantCashService.java
index 1b090b0..1733ef0 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantCashService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantCashService.java
@@ -32,5 +32,8 @@
@PostMapping("/report/consultant/cash/total/list")
Result totalList(@RequestBody ConsultantCashReportDto dto);
+ /** 瀵煎嚭 - 鍜ㄨ甯堢幇閲戜笟缁� */
+ @PostMapping("/report/consultant/cash/export")
+ Result export(@RequestBody ConsultantCashReportDto dto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantPerfService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantPerfService.java
index 8e14d7d..7e9d2f3 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantPerfService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantPerfService.java
@@ -27,6 +27,17 @@
Result summaryList(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
+ /**
+ * 鍜ㄨ甯堜笟缁╁鍑�
+ */
+ @PostMapping("/admin/consultant/perf/export")
+ Result export(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
+
+ /**
+ * 鍜ㄨ甯堜笟缁╂眹鎬诲鍑�
+ */
+ @PostMapping("/admin/consultant/perf/summary/export")
+ Result sumExport(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
index e918438..85d552e 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
@@ -94,5 +94,10 @@
@PostMapping("/admin/consultant/report/user/doctor/deduction/list")
Result userDoctorDeductionList(@RequestBody EmployeeReportDto employeeReportDto);
+ /**
+ * 鍜ㄨ甯�-鍖荤敓鎵ц鍗犳瘮鏁版嵁鍒楄〃-鏈堢粺璁�
+ */
+ @PostMapping("/admin/consultant/report/user/doctor/deduction/list/month")
+ Result userDoctorDeductionMonthList(@RequestBody EmployeeReportDto employeeReportDto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java
index 17fc49a..b3e6641 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java
@@ -21,5 +21,10 @@
@PostMapping("/deduction/surface/list")
Result surfaceList(@RequestBody DeductionSurfaceDto deductionSurfaceDto);
+ /**
+ * 鏈墽琛屾槑缁嗗揩鐓у垪琛�
+ */
+ @PostMapping("/deduction/surface/list/data")
+ Result surfaceListData(@RequestBody DeductionSurfaceDto deductionSurfaceDto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorPerfService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorPerfService.java
index 90a2683..1968ec7 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorPerfService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorPerfService.java
@@ -27,6 +27,17 @@
Result summaryList(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
+ /**
+ * 鍖荤敓涓氱哗瀵煎嚭
+ */
+ @PostMapping("/admin/doctor/perf/export")
+ Result export(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
+
+ /**
+ * 鍖荤敓涓氱哗姹囨�诲鍑�
+ */
+ @PostMapping("/admin/doctor/perf/summary/export")
+ Result sumExport(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiNursePerfService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiNursePerfService.java
index c124cfc..2a5380c 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiNursePerfService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiNursePerfService.java
@@ -21,12 +21,22 @@
Result list(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
/**
- * 鍖荤敓鎵ц涓氱哗姹囨��
+ * 鎶ゅ＋鎵ц涓氱哗姹囨��
*/
@PostMapping("/admin/nurse/perf/summary/list")
Result summaryList(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
+ /**
+ * 鎶ゅ＋涓氱哗瀵煎嚭
+ */
+ @PostMapping("/admin/nurse/perf/export")
+ Result export(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
+ /**
+ * 鎶ゅ＋涓氱哗姹囨�诲鍑�
+ */
+ @PostMapping("/admin/nurse/perf/summary/export")
+ Result sumExport(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
index 908aac6..2f55d29 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
@@ -83,4 +83,10 @@
@PostMapping("/admin/export/shop/user/doctor/deduction/list")
Result userDoctorDeductionList(@RequestBody ShopReportDto shopReportDto);
+ /**
+ * 闂ㄥ簵-鍖荤敓鎵ц鍗犳瘮鎯呭喌-鏈堢粺璁�
+ */
+ @PostMapping("/admin/export/shop/user/doctor/deduction/list/month")
+ Result userDoctorDeductionMonthList(@RequestBody ShopReportDto shopReportDto);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTmkPerfService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTmkPerfService.java
index 4b2f735..da3e69f 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTmkPerfService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTmkPerfService.java
@@ -16,7 +16,7 @@
public interface BiTmkPerfService {
/**
- * 璁㈠崟涓氱哗鏄庣粏鍒楄〃
+ * 鐢电綉涓氱哗鏄庣粏鍒楄〃
*/
@PostMapping("/admin/tmk/perf/orderPerfList")
Result orderPerfList(@RequestBody TmkOrderPerfReqDto tmkOrderPerfReqDto);
@@ -33,5 +33,17 @@
@PostMapping("/admin/tmk/perf/summary/sumData")
Result sumData(@RequestBody TmkOrderPerfReqDto tmkOrderPerfReqDto);
+ /**
+ * 鐢电綉涓氱哗瀵煎嚭
+ */
+ @PostMapping("/admin/tmk/perf/orderPerfExport")
+ Result export(@RequestBody TmkOrderPerfReqDto tmkOrderPerfReqDto);
+
+ /**
+ * 鐢电綉涓氱哗姹囨�诲鍑�
+ */
+ @PostMapping("/admin/tmk/perf/summary/export")
+ Result sumExport(@RequestBody TmkOrderPerfReqDto tmkOrderPerfReqDto);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java
index e159665..e02dcc3 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java
@@ -1,11 +1,8 @@
package com.hz.his.feign.service.platform.bi;
import com.hx.resultTool.Result;
-import com.hz.his.dto.file.FileExUpdateDto;
-import com.hz.his.dto.file.FileExportDto;
-import com.hz.his.vo.bi.exp.CashierSettlementVo;
-import com.hz.his.vo.bi.exp.CashierSurfaceVo;
-import com.hz.his.vo.bi.exp.DeductionSurfaceVo;
+import com.hz.his.dto.report.CashierSettlementDto;
+import com.hz.his.dto.report.DeductionSurfaceDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -21,21 +18,27 @@
* 鏃犺浆鎹�
*/
@PostMapping(value = "/exp/cashier/settlement")
- Result cashierSettlement(@RequestBody CashierSettlementVo cashierSettlementVo);
+ Result cashierSettlement(@RequestBody CashierSettlementDto cashierSettlementDto);
/**
* 瀵煎嚭鏀堕摱鎶ヨ〃
* 杞崲鏃�
*/
@PostMapping(value = "/exp/cashier/surface")
- Result cashierSurface(@RequestBody CashierSurfaceVo cashierSurfaceVo);
+ Result cashierSurface(@RequestBody CashierSettlementDto cashierSettlementDto);
/**
* 瀵煎嚭鍒掓墸鎶ヨ〃
* 杞崲鏃�
*/
@PostMapping(value = "/exp/deduction/surface")
- Result deductionSurface(@RequestBody DeductionSurfaceVo deductionSurfaceVo);
+ Result deductionSurface(@RequestBody DeductionSurfaceDto deductionSurfaceDto);
+ /**
+ * 瀵煎嚭鍒掓墸蹇収鎶ヨ〃
+ * 杞崲鏃�
+ */
+ @PostMapping(value = "/exp/deduction/surface/data")
+ Result deductionSurfaceData(@RequestBody DeductionSurfaceDto deductionSurfaceDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/refund/SCardRefundService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/refund/SCardRefundService.java
new file mode 100644
index 0000000..4761502
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/refund/SCardRefundService.java
@@ -0,0 +1,30 @@
+package com.hz.his.feign.service.platform.refund;
+
+import com.hx.resultTool.Result;
+import com.hz.his.vo.order.refund.card.RefundUserCardVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**鐢ㄦ埛鍗￠」閫�娆緁eign
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ * @author CJH
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "card-refund")
+public interface SCardRefundService {
+
+ /**
+ * 寮�鏀惧钩鍙�-鑾峰彇鐢ㄦ埛鍗￠」鏉＄洰鍙��娆鹃噾棰�
+ * data 瀹炰綋杞寲鐢紙RefundUserCardVo锛�
+ */
+ @PostMapping(value = "/card/refund/get/amount")
+ Result getRefundAmount(@RequestBody RefundUserCardVo refundUserCardVo);
+
+ /**
+ * 寮�鏀惧钩鍙�-纭鎻愪氦閫�娆�
+ * data 鏃犲疄浣撹浆鍖栫敤
+ */
+ @PostMapping(value = "/confirm")
+ Result refundConfirm(@RequestBody RefundUserCardVo refundUserCardVo);
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/vo/cos/OssRecoverVO.java b/phis-feign/src/main/java/com/hz/his/vo/cos/OssRecoverVO.java
new file mode 100644
index 0000000..1e05b0b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/cos/OssRecoverVO.java
@@ -0,0 +1,25 @@
+package com.hz.his.vo.cos;
+
+import lombok.Data;
+
+/**
+ * @ClassName OssRecoverVO
+ * @Description cos鐢熸垚绛惧悕杩斿洖vo
+ * @Author wrh
+ * @Date 2023/6/30 17:30
+ * @Version 1.0
+ */
+@Data
+public class OssRecoverVO {
+
+ private String accessid;
+ //绛惧悕
+ private String signature;
+ private String dir;
+ private String host;
+ //杩囨湡鏃堕棿
+ private String expire;
+
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java
new file mode 100644
index 0000000..053da40
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java
@@ -0,0 +1,40 @@
+package com.hz.his.vo.order.refund;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author CJH
+ * 閫�鍥炴敮浠樿褰曟墿灞�
+ */
+@Data
+public class RefundMethodVo {
+
+ /** 鍙��鏀粯鏂瑰紡鏍囪瘑 */
+ private String payMethodId;
+ /** 鍙��鏀粯鏂瑰紡缂栫爜 */
+ private String payMethodNo;
+ /** 鍙��鏀粯鏂瑰紡鍚嶇О */
+ private String payMethodName;
+ /** 鍙��鏀粯閲戦 */
+ private BigDecimal payTotal;
+ /**鏄惁鐜伴噾鏀粯 0鍚�1鏄�*/
+ private Integer isMoneyPay;
+ /**鏄惁鍒掓墸璁＄畻锛�0鍚�1鏄�*/
+ private Integer isExecute;
+
+ /** 杞崲鏂瑰紡鏍囪瘑 锛堝疄闄呴��娆炬柟寮忔爣璇嗭級*/
+ private String refundMethodId;
+ /** 杞崲鏂瑰紡缂栫爜 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級*/
+ private String refundMethodNo;
+ /** 杞崲鏂瑰紡鍚嶇О 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級*/
+ private String refundMethodName;
+ /** 杞崲瀹為��閲戦 锛堝疄闄呴��娆鹃噾棰濓級*/
+ private BigDecimal refundTotal;
+ /**杞崲鏄惁鐜伴噾鏀粯 0鍚�1鏄�*/
+ private Integer isMoneyPayRefund;
+ /**杞崲鏄惁鍒掓墸璁＄畻锛�0鍚�1鏄�*/
+ private Integer isExecuteRefund;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java
new file mode 100644
index 0000000..bcdaa7e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java
@@ -0,0 +1,31 @@
+package com.hz.his.vo.order.refund.card;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**鍗￠」锛堝崱鍖咃級閫�娆鹃噾棰濅俊鎭绠楃粨鏋勪綋-鏉冪泭
+ * @author CJH
+ * */
+@Data
+public class RefundUserCardEquityVo {
+
+ /** 鐢ㄦ埛鍗″寘鍗￠」鏉＄洰鏍囪瘑 */
+ private String cardEquityId;
+ /** 鐢ㄦ埛鍗″寘鍗￠」鏉＄洰鍚嶇О */
+ private String cardEquityName;
+ /** 閫�娆惧崱椤规潯鐩� */
+ private List<RefundUserCardItemVo> refundUserCardItemVoList;
+
+ //---鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻
+ /** 鍙��鎬婚噾棰�*/
+ private BigDecimal approveRefundTotal = BigDecimal.ZERO;
+ /** 鍙��鎬荤Н鍒�*/
+ private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+ /**鍒嗛厤閲戦*/
+ private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
+ /**鍒嗛厤绉垎*/
+ private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java
new file mode 100644
index 0000000..c079fca
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java
@@ -0,0 +1,33 @@
+package com.hz.his.vo.order.refund.card;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**鍗￠」锛堝崱鍖咃級閫�娆鹃噾棰濅俊鎭绠楃粨鏋勪綋-鏉＄洰
+ * @author CJH
+ * */
+@Data
+public class RefundUserCardItemVo {
+
+ /** 鐢ㄦ埛鍗″寘鍗￠」鏉＄洰鏍囪瘑 */
+ private String cardItemInfoId;
+ /** 鐢ㄦ埛鍗″寘鍗￠」鏉＄洰鍚嶇О */
+ private String cardItemInfoName;
+ /**閫�娆炬暟閲忥紙鎶垫墸娆℃暟锛�*/
+ private Integer refundQuantity;
+ /**鏄惁鏈�鍚庣殑鎶垫墸娆℃暟*/
+ private boolean lastNum = false;
+
+ //---鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻
+ /** 鍙��鎬婚噾棰�*/
+ private BigDecimal approveRefundTotal = BigDecimal.ZERO;
+ /** 鍙��鎬荤Н鍒�*/
+ private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+ /**鍒嗛厤閲戦*/
+ private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
+ /**鍒嗛厤绉垎*/
+ private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java
new file mode 100644
index 0000000..5a96e24
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java
@@ -0,0 +1,66 @@
+package com.hz.his.vo.order.refund.card;
+
+
+import com.hz.his.vo.order.refund.RefundMethodVo;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**鍗￠」锛堝崱鍖咃級閫�娆鹃噾棰濅俊鎭绠楃粨鏋勪綋-鎬讳俊鎭�
+ * @author CJH
+ */
+@Data
+public class RefundUserCardVo {
+
+ /** 鐢ㄦ埛鍗″寘鏍囪瘑 */
+ private String userCardId;
+ /** 鐢ㄦ埛鍗″寘鍚嶇О */
+ private String userCardName;
+
+ /** 鍗￠」鏉冪泭 */
+ private List<RefundUserCardEquityVo> refundUserCardEquityVoList;
+ /**鏀粯鏂瑰紡*/
+ private List<RefundMethodVo> payMethodVos;
+ /**閫�娆炬敮浠樻柟寮�*/
+ private List<RefundMethodVo> refundMethodVos;
+ /** 閫�娆惧師鍥狅紙鍛樺伐锛� */
+ private String remarks;
+ /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
+ private String refundReason;
+
+ /**鎿嶄綔浜虹被鍨嬶紝榛樿鍛樺伐*/
+ private String opType = OP_TYPE_STAFF;
+ /**鎿嶄綔鍛樺伐鏍囪瘑*/
+ private String staffId;
+ /**鎿嶄綔鍛樺伐瑙掕壊鏍囪瘑*/
+ private String staffRoleId;
+ /**鎿嶄綔骞冲彴-鏍囧織*/
+ private String appId;
+ /**鎿嶄綔骞冲彴-鍟嗘埛鑷畾涔夌紪鐮�*/
+ private String appIdCode;
+ /**鎿嶄綔骞冲彴-鍚嶇О*/
+ private String appIdName;
+
+ //-----鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻
+ /**绯荤粺璁＄畻璧嬪��-鍙��鎬婚噾棰�*/
+ private BigDecimal approveRefundTotal = BigDecimal.ZERO;
+ /**绯荤粺璁＄畻璧嬪��-鍙��鎬荤Н鍒�*/
+ private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+ /**绯荤粺璁＄畻璧嬪��-鍒嗛厤閲戦*/
+ private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
+ /**绯荤粺璁＄畻璧嬪��-鍒嗛厤绉垎*/
+ private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;
+ /**绯荤粺璁＄畻璧嬪��-閫�娆鹃噾棰�*/
+ private BigDecimal refundTotal = BigDecimal.ZERO;
+ /**绯荤粺璁＄畻璧嬪��-閫�娆剧Н鍒�*/
+ private BigDecimal refundIntegral = BigDecimal.ZERO;
+
+ /**鎿嶄綔绫诲瀷-绯荤粺*/
+ public static final String OP_TYPE_SYSTEM = "system";
+ /**鎿嶄綔绫诲瀷-鐢ㄦ埛*/
+ public static final String OP_TYPE_USER = "user";
+ /**鎿嶄綔绫诲瀷-鍛樺伐*/
+ public static final String OP_TYPE_STAFF = "staff";
+
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java
index b92d257..a08b8de 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java
@@ -12,7 +12,7 @@
* */
@Data
public class GoodsDetailDt extends BaseDt {
- /**绫诲瀷(1鍟嗗搧2鑽搧)*/
+ /**绫诲瀷(1鍟嗗搧2鑽搧3浼樻儬鍒�)*/
private Integer type;
/**缂栧彿*/
private String serialNumber;
@@ -172,4 +172,9 @@
private String bigTypeCode;
/**鑽搧澶х被鍚�*/
private String bigTypeName;
+
+ //鍏宠仈鏍囪瘑(绫诲瀷涓�3鍒欏叧鑱斾紭鎯犲埜id)
+ public String commonId;
+ //鍏戞崲绉垎
+ private BigDecimal integral;
}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
index 294caa5..091e66d 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
@@ -5,6 +5,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.util.Date;
/**鐢ㄦ埛璇︽儏鏁版嵁杩斿洖瀹炰綋*/
@Data
@@ -77,5 +78,12 @@
private String internetCorpUserId;
//鎵�灞炴姢澹�
private String nurseCorpUserId;
+ //绗竴娆″埌搴楁椂闂�
+ private Date firstArriveTime;
+ //绗竴娆′笅鍗曟椂闂�(缁撹处鎴愬姛鐨勬椂闂�)
+ private Date firstPayOrderTime;
+ //鏈�鍚庝竴娆℃墽琛屾椂闂�
+ private Date lastDeductionTime;
+
}
--
Gitblit v1.8.0