From e4538a591ef58e33984e9e8209833d1243719e2e Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期三, 02 八月 2023 11:57:04 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into fhx-prod-热门活动
---
phis-feign/src/main/java/com/hz/his/dto/user/UserPackListDto.java | 12
phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java | 5
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 8
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingReturnDto.java | 32 +
phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java | 7
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingContentDto.java | 16
phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsUsedCouponDto.java | 4
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarCommonReturnDto.java | 23 +
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 21 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java | 8
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java | 29 +
phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardVo.java | 13
phis-feign/src/main/java/com/hz/his/dto/user/UserPackDto.java | 18
phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java | 3
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 6
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java | 17
phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java | 140 ++++++
phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java | 3
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 2
phis-feign/src/main/java/com/hz/his/feign/service/platform/refund/SCardRefundService.java | 2
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgDto.java | 20 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java | 11
phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectDto.java | 9
phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentCrmAddDto.java | 64 +++
phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java | 7
phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java | 4
phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java | 22 +
phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java | 6
phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java | 24 +
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 13
phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java | 6
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 | 4
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/marketing/common/MarketingMsgItemDto.java | 17
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 6
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingResultDto.java | 17
phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalItemDto.java | 24 +
phis-feign/src/main/java/com/hz/his/feign/service/phis/SDoctorTimeService.java | 49 ++
phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalDto.java | 24 +
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java | 5
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipAppointmentService.java | 19 +
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 6
phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java | 26 +
phis-feign/src/main/java/com/hz/his/dto/channel/ChannelGeneralDto.java | 30 +
phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java | 8
phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java | 2
phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsAssocDt.java | 30 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java | 7
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/phis/SChannelsService.java | 16
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java | 13
phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDeLimitDt.java | 5
phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java | 34 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java | 31 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/SWxTokenService.java | 45 ++
phis-feign/src/main/java/com/hz/his/dto/PageDto.java | 4
59 files changed, 1,056 insertions(+), 30 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 adb4238..6d9e6b9 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
@@ -3,6 +3,8 @@
import lombok.Data;
+import java.util.List;
+
/**
* @author ChenJiaHe
* 鍒嗛〉鎵╁睍绫�*/
@@ -20,7 +22,7 @@
private String parentId;
/**鍒嗙被鏍囪瘑*/
private String typeId;
-
+ private List<String> typeIdList;
//appid
private String appId;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentCrmAddDto.java b/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentCrmAddDto.java
new file mode 100644
index 0000000..7325210
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentCrmAddDto.java
@@ -0,0 +1,64 @@
+package com.hz.his.dto.appointment;
+
+import lombok.Data;
+
+/**
+ * 棰勭害鍙傛暟灏佽
+ *
+ * @Author: zhouxiang
+ * @Date: 2022/06/01/17:44
+ * @Description:
+ */
+@Data
+public class AppointmentCrmAddDto {
+
+ //澶勭悊绫诲瀷(1鏂板2缂栬緫3鍙栨秷)
+ private Integer handleType;
+
+ //棰勭害id
+ private String appointmentId;
+ //crm鏉ユ簮id
+ private String sourceId;
+
+ //闂ㄥ簵鏍囪瘑
+ private String shopId;
+ //鐢ㄦ埛鏍囪瘑
+ private String userId;
+ //鍖荤敓鏍囪瘑
+ private String doctorId;
+ //灏辫瘖绫诲瀷
+ private String visitType;
+ //棰勭害绫诲瀷
+ private Integer appType;
+ //棰勭害寮�濮嬫椂闂�
+ private String startTime;
+ //棰勭害缁撴潫鏃堕棿
+ private String endTime;
+ //澶囨敞
+ private String remark;
+ //椁愰澶囨敞
+ private String mealsRemark;
+
+ //椤圭洰json
+ private String projectJson;
+ //椤圭洰ID
+ private String projectIds;
+ //椤圭洰鍚嶇О
+ private String projectNames;
+
+
+ //闈㈣瘖鏃堕暱锛屼互鍒嗕负鍗曚綅
+ private Integer docComDuration;
+ //娌熼�氭椂闀匡紝浠ュ垎涓哄崟浣�
+ private Integer comDuration;
+ //鎵嬫湳鍑嗗鏃堕暱锛屼互鍒嗕负鍗曚綅"
+ private Integer readyDuration;
+ //娌荤枟鏃堕暱锛屼互鍒嗕负鍗曚綅
+ private Integer treatDuration;
+ //绛夊緟鏃堕暱锛屼互鍒嗕负鍗曚綅
+ private Integer waitDuration;
+ //楹绘暦鏃堕棿锛屼互鍒嗕负瀛樺偍鍗曚綅
+ private Integer palsyDuration;
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java b/phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java
index cd2508f..585cc39 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java
@@ -14,6 +14,8 @@
private String userId;
/**鍗″寘鏍囪瘑*/
private String cardBagId;
+ /**鍗″寘鏈夋晥鐘舵��*/
+ private Integer effectiveStatus;
/**鎿嶄綔鍛樺伐鏍囪瘑*/
private String opEmployeeId;
/**鎿嶄綔闂ㄥ簵鏍囪瘑*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/channel/ChannelGeneralDto.java b/phis-feign/src/main/java/com/hz/his/dto/channel/ChannelGeneralDto.java
new file mode 100644
index 0000000..e04fe41
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/channel/ChannelGeneralDto.java
@@ -0,0 +1,30 @@
+package com.hz.his.dto.channel;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author fwq
+ * 娓犻亾鎵╁睍
+ * */
+@Data
+public class ChannelGeneralDto {
+
+ /**涓绘笭閬撲竴绾ф爣璇�*/
+ private String channelId;
+ /**涓绘笭閬撲簩绾ф爣璇�*/
+ private String channel2Id;
+
+ /**娆℃笭閬撲竴绾ф爣璇�*/
+ private String channelAssId;
+ /**娆℃笭閬撲簩绾ф爣璇�*/
+ private String channelAss2Id;
+
+ /**娓犻亾澶х被鏍囪瘑*/
+ private List<String> typeIdList;
+
+ /**鍒ゆ柇鍝簺:0涓绘笭閬�1娆℃笭閬�*/
+ private Integer checkType;
+
+}
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..a79a32c 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
@@ -1,9 +1,9 @@
package com.hz.his.dto.coupon;
-
-
import com.hz.his.dto.PageDto;
import lombok.Data;
+
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -18,6 +18,10 @@
private String operatorId;
/**鎿嶄綔浜哄悕绉�*/
private String operatorName;
+ /**鎿嶄綔浜虹被鍨�*/
+ private Integer operatorType;
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
/**娲诲姩鏍囪瘑*/
private String groupBuyId;
private String id;
@@ -38,4 +42,9 @@
/*鐢ㄦ埛浼樻儬鍒�*/
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/deduction/DeductionDto.java b/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
index 5d1e9d1..a5e55e7 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
@@ -2,26 +2,142 @@
import lombok.Data;
+import java.util.Date;
import java.util.List;
/**
- * @ClassName DeductionDto
- * @Description 鍒掓墸
- * @Author Wrh
- * @Date 2022/10/13 10:37
- * @Version 1.0
+ * 鍒掓墸鎺ュ彈鍙傛暟 鍏堟敼鍚嶅悗缁簾寮�
+ * author:andru
+ * Date:2021/12/10 14:41
*/
@Data
public class DeductionDto {
- /**鍒掓墸id*/
+ // 鍒掓墸璁板綍id
private String deductionSingleId;
- /**鐢ㄦ埛id*/
- private String userId;
- /**鏄惁瀹㈡埛纭(0:鍚︼紝1:鏄�)*/
- private Integer isCustomerConfirm;
- /**娌荤枟閫氱煡鍗曟不鐤楅」鐩甶d*/
+
+ // 鐢ㄦ埛椤圭洰id
+ private String userProjectId;
+
+ // 鐢ㄦ埛椤圭洰瀛愰」id(鍏蜂綋鍒掓墸鐨勯」鐩暟鎹殑id)
+ private String userProjectItemId;
+
+ // 鍏敤鏍囪瘑 (棰勭害璁㈠崟濉啓id)
+ private String commonId;
+
+ // 娌荤枟閫氱煡鍗昳d
+ private String treatSingleId;
+
+ // 娌荤枟閫氱煡鍗曟不鐤楅」鐩甶d
private String treatProjectId;
- /**椤圭洰id鍒楄〃*/
+
+ // 鎺ヨ瘖鍜ㄨ甯坕d
+ private String receptionConsultantId;
+
+ // 鏂板绫诲瀷 DeductionSingleConstants.TYPE_SELF_ADD 榛樿鑷
+ private String type = "self_add";
+
+ // 绉戝id(FamiliesRoom)
+ private String departmentId;
+ // 绉戝缂栧彿
+ private String departmentCode;
+ // 绉戝鍚嶇О
+ private String departmentName;
+
+ // 涓昏瘖鍖荤敓鏍囪瘑(Employee)
+ private String primaryDoctorId;
+ // 涓昏瘖鍖荤敓鍚嶇О
+ private String primaryDoctorName;
+
+ // 娌荤枟鍖荤敓鏍囪瘑(Employee)
+ private String treatmentDoctorId;
+ // 娌荤枟鍖荤敓鍚嶇О
+ private String treatmentDoctorName;
+
+ // 澶囨敞淇℃伅
+ private String remarkInfo;
+
+ // 鏉ユ簮搴旂敤appId(鍒涘缓璁㈠崟骞冲彴)
+ private String appId;
+
+ // 鏉ユ簮搴旂敤缂栫爜(鍟嗘埛璁剧疆骞冲彴缂栫爜,绯荤粺榛樿,浠ｇ爜蹇呭～)
+ private String appIdCode;
+
+ // 鏉ユ簮浠ｇ爜锛堝簲鐢╝ppId锛�
+ private String sourceCode;
+
+ // 鏉ユ簮鍚嶇О
+ private String sourceName;
+
+ // 鏁伴噺/鍒掓墸娆℃暟
+ private Integer deductionNum = 0;
+
+ // 鎵ц寮�濮嬫椂闂�
+ private Date executeStartTime;
+
+ // 鎵ц缁撴潫鏃堕棿
+ private Date executeEndTime;
+
+ // 鍙備笌浜哄憳鏁版嵁 json
+ private String deductionJoinJson;
+
+ // 鍒掓墸椤圭洰娑堣�楀鏂�/鑽搧鏁版嵁 json
+ private String deductionDrugsJson;
+
+ // 鍒掓墸璁惧鍙傛暟鏁版嵁 json
+ private String deductionDeviceParameterJson;
+
+ // 瀹㈡埛绛惧悕鏁版嵁 json
+ private String deductionSignJson;
+
+ // 鍒掓墸韬綋閮ㄤ綅鏁版嵁 json
+ private String deductionBodyPartJson;
+
+ // 瀵规瘮鐓х墖璁板綍
+ private String comparePhotoRecordJson;
+
+ // 鎵归噺娣诲姞椤圭洰id鍒楄〃
+ private String userProjectIds;
+
+ // 闂ㄥ簵id
+ private String shopId;
+
+ // 鎿嶄綔浜哄憳宸d
+ private String operatorId;
+
+ // 鐢ㄦ埛id
+ private String userId;
+
+ // 鍒掓墸鏃ュ織寮�濮嬫椂闂�
+ private String logStartTime;
+
+ // 鍒掓墸鏃ュ織缁撴潫鏃堕棿
+ private String logEndTime;
+
+ // 鍒掓墸鏃ュ織-鏌ヨHis鍒掓墸鍒嗛〉鏃ュ織椤垫暟
+ private Integer page;
+
+ // 鍒掓墸鏃ュ織-鏌ヨHis鍒掓墸鍒嗛〉鏃ュ織鏉℃暟
+ private Integer size;
+
+ // 瀹㈡埛纭鐘舵��
+ private Integer isCustomerConfirm;
+
+ //閮ㄤ綅绫诲瀷锛圖eductionSingleConstants锛�
+ private Integer partType;
+ //璁㈠崟鍒嗙被锛圤rderTotalConstants锛�
+ private Integer orderClassify;
+
+ // 椤圭洰id鍒楄〃
private List<String> projectIds;
+
+ // phitab鍒掓墸鍒涘缓鏃堕棿
+ private Date phitabCreateTime;
+
+ // 鏄惁鍙戦�佸垝鎵ｆ秷鎭� 0 鍚� 1 鏄�
+ private int isSentNotice = 1;
+
+ public DeductionDto() {
+
+ }
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java b/phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java
new file mode 100644
index 0000000..249900a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java
@@ -0,0 +1,26 @@
+package com.hz.his.dto.doctorTime;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @ClassName DoctorTimeDto
+ * @Description 鍖荤敓鎺掔彮dto
+ * @Author wrh
+ * @Date 2023/7/4 14:40
+ * @Version 1.0
+ */
+@Data
+public class DoctorTimeDto extends PageDto {
+
+ String monthStr;
+ String shopId;
+ String doctorId;
+ String dayTime;
+ Date startTime;
+ Date endTime;
+ Integer intervalTime;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarCommonReturnDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarCommonReturnDto.java
new file mode 100644
index 0000000..b7a39d8
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarCommonReturnDto.java
@@ -0,0 +1,23 @@
+package com.hz.his.dto.marketing.common;
+
+import lombok.Data;
+
+/**
+ * 钀ラ攢鍔╂墜璇锋眰鍥炶皟鍙傛暟
+ * @author fwq
+ */
+@Data
+public class MarCommonReturnDto {
+
+ /**appId*/
+ private String appId;
+ /**鏃堕棿 骞存湀鏃ユ椂鍒嗙*/
+ private String time;
+ /**sign*/
+ private String sign;
+ /**杩斿洖鏁版嵁 鍙弬鑰僊arketingReturnDto*/
+ private String data;
+
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingContentDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingContentDto.java
new file mode 100644
index 0000000..18b1352
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingContentDto.java
@@ -0,0 +1,16 @@
+package com.hz.his.dto.marketing.common;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 钀ラ攢鍔╂墜鍙戦�佹秷鎭弬鏁�
+ * @author fwq
+ */
+@Data
+public class MarketingContentDto {
+ /**灞曠ず鍐呭閿�煎*/
+ private List<MarketingMsgItemDto> contentList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgDto.java
new file mode 100644
index 0000000..d1305d8
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgDto.java
@@ -0,0 +1,20 @@
+package com.hz.his.dto.marketing.common;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 钀ラ攢鍔╂墜鍙戦�佹秷鎭弬鏁�
+ * @author fwq
+ */
+@Data
+public class MarketingMsgDto {
+
+ /*******************蹇呭～椤�*************************/
+ /** 鏄惁鏀惧ぇ绗竴涓猚ontent_item锛岄粯璁rue*/
+ private Boolean emphasisFirstItem = true;
+ /** 娑堟伅鍐呭閿�煎锛屾渶澶氬厑璁�10涓猧tem -蹇呭～椤�*/
+ private List<MarketingMsgItemDto> contentItem;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgItemDto.java
new file mode 100644
index 0000000..5c3b700
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgItemDto.java
@@ -0,0 +1,17 @@
+package com.hz.his.dto.marketing.common;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 钀ラ攢鍔╂墜鍙戦�佹秷鎭弬鏁�
+ * @author fwq
+ */
+@Data
+public class MarketingMsgItemDto {
+ /**濡傛灉鏄彂閫佺殑娑堟伅锛氶暱搴�10涓眽瀛椾互鍐� -蹇呭～椤�*/
+ private String key;
+ /**濡傛灉鏄彂閫佺殑娑堟伅锛� 闀垮害30涓眽瀛椾互鍐� -蹇呭～椤�*/
+ private String value;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingResultDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingResultDto.java
new file mode 100644
index 0000000..7df2a42
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingResultDto.java
@@ -0,0 +1,17 @@
+package com.hz.his.dto.marketing.common;
+
+import lombok.Data;
+
+/**
+ * 钀ラ攢鍔╂墜璇锋眰杩斿洖鍙傛暟
+ * @author fwq
+ */
+@Data
+public class MarketingResultDto {
+ /**钀ラ攢鍔╂墜鍞竴鏍囪瘑*/
+ private String applyId;
+ /**瀹℃牳鏍囪瘑*/
+ private String examineId;
+ /**鏄惁鐩存帴閫氳繃:0鍚�1鏄�*/
+ private Integer isPass;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingReturnDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingReturnDto.java
new file mode 100644
index 0000000..81fef17
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingReturnDto.java
@@ -0,0 +1,32 @@
+package com.hz.his.dto.marketing.common;
+
+import lombok.Data;
+
+/**
+ * 钀ラ攢鍔╂墜璇锋眰鍥炶皟鍙傛暟
+ * @author fwq
+ */
+@Data
+public class MarketingReturnDto{
+
+ /**瀹℃牳缁撴灉 agree涓洪�氳繃,reject涓轰笉閫氳繃*/
+ public static final String AGREE = "agree";
+ public static final String REJECT = "reject";
+ /**瀹℃牳缁撴灉*/
+ private String result;
+ /**杩斿洖淇℃伅*/
+ private String resultMsg;
+ /**鍞竴鏍囪瘑*/
+ private String uniqueId;
+ /**瀹℃牳鏍囪瘑*/
+ private String applyId;
+ /**瀹℃牳浜烘爣璇�*/
+ private String opId;
+ /**瀹℃牳浜哄悕绉�*/
+ private String opMan;
+ /**瀹℃牳鎰忚*/
+ private String applyRemarks;
+
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java
new file mode 100644
index 0000000..e421cb2
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java
@@ -0,0 +1,29 @@
+package com.hz.his.dto.marketing.common;
+
+import com.hz.his.dto.marketing.MarketingDto;
+import lombok.Data;
+
+/**
+ * 钀ラ攢鍔╂墜璇锋眰鍏叡鍙傛暟
+ * @author fwq
+ */
+@Data
+public class MarketingTotalDto extends MarketingDto {
+
+ /******MarketingDto缁ф壙瀛楁 -蹇呭～椤�****/
+
+ /**瀹℃牳绫诲瀷 >20鐨勫��*/
+ private Integer type;
+ /**瀹℃牳鍞竴鏍囪瘑*/
+ private String uniqueId;
+
+ /**瀹℃壒鐣岄潰灞曠ず鐨勫唴瀹� -蹇呭～椤�*/
+ private MarketingContentDto marketingContentDto;
+
+ /**娑堟伅鍙戦�佸唴瀹� -蹇呭～椤�*/
+ private MarketingMsgDto marketingMsgDto;
+
+ /**鍥炶皟閾炬帴 -蹇呭～椤� 鍥炶皟浼犲弬*/
+ private String callbackUrl;
+
+}
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 a0488d8..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,6 +26,9 @@
/** 骞冲彴鏉ユ簮 鍥犱负鏄痟is鍔╂墜鍙栨秷璁㈠崟鐨勮瘽灏辫鑷姩纭閫�娆惧崟 蹇呭～*/
private Integer platformSource;
+ /** 鍙栨秷璁㈠崟澶囨敞 */
+ private String remarks;
+
/**his鍔╂墜*/
public static final Integer HIS_ASSISTANT = 0;
/**his鍚庡彴*/
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/OrderPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
index bc5dfb3..a0a1f97 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
@@ -26,4 +26,8 @@
private List<OrderItemPHisDto> orderItem;
/**寮�鍙戜汉闆嗗悎 闈炲繀濉�*/
private List<OrderDeveloperDto> orderDeveloper;
+
+ /**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
+ private Integer cardPass = 0;
+
}
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 3590a52..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
@@ -65,6 +65,9 @@
/**蹇呭～ 璁㈠崟鎬婚噾棰�(璁㈠崟绫诲瀷鏄厖鍊艰鍗曞繀濉�,鍚﹀垯闈炲繀濉�) */
private BigDecimal total;
+ /**闈炲繀濉� 璁㈠崟鎬荤Н鍒�(璁㈠崟绫诲瀷鏄Н鍒嗚鍗曞繀濉�,鍚﹀垯闈炲繀濉�) */
+ private BigDecimal totalPoints;
+
/**闈炲繀濉� 璁㈠崟鍏朵粬淇℃伅(娌℃湁鍚庡彴榛樿)*/
private OrderInfoDto orderInfo;
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/order/PayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
index 1744607..a8b6967 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
@@ -48,7 +48,11 @@
/**绗笁鏂硅鍗曠紪鍙�*/
private String otherOrderNo;
-
/**绗笁鏂瑰厬鎹㈢爜*/
private String redemptionCode;
+
+ /**缁撹处涔嬪悗鏄惁鐩存帴鍒掓墸锛�0鍚�1鏄�*/
+ private Integer directDeduction = 0;
+ /**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
+ private Integer cardPass = 0;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java
index a7893c9..bb999f1 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java
@@ -11,8 +11,12 @@
@Data
public class ClinicPerfReqDto extends BaseQueryVo{
- /** 闂ㄥ簵id */
+ /** 鎵�灞為棬搴梚d */
private String shopId;
+ /** 璁㈠崟闂ㄥ簵 */
+ private String orderShopId;
+ /** 鏀堕摱闂ㄥ簵*/
+ private String cashierShopId;
/** 寮�濮嬫椂闂� */
private String startTime;
/** 缁撴潫鏃堕棿 */
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
index 928ce41..afef51e 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
@@ -14,6 +14,7 @@
private String employeeId;
/**闂ㄥ簵鏍囪瘑*/
private String shopId;
+ private String shopIds;
/**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/
private String roleStr;
/**鍛樺伐鏍囪瘑闆嗗悎*/
@@ -28,4 +29,8 @@
private String endTime;
/**绫诲瀷*/
private Integer type;
+ /**鏄惁鏂颁細鍛�*/
+ private Integer isNewUser;
+ /**鏄惁棣栧ぉ*/
+ private Integer isBothOne;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserPackDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserPackDto.java
new file mode 100644
index 0000000..58cb540
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserPackDto.java
@@ -0,0 +1,18 @@
+package com.hz.his.dto.user;
+
+import lombok.Data;
+
+
+/**浜虹兢鍖呮煡璇㈠弬鏁�*/
+@Data
+public class UserPackDto{
+
+ /**ciq*/
+ private String CIQ;
+ /**鍚嶇О*/
+ private String name;
+ /**浼氬憳鍙�*/
+ private String memberNO;
+ /**鎵嬫満鍙�*/
+ private String tel;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserPackListDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserPackListDto.java
new file mode 100644
index 0000000..dfaed1a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserPackListDto.java
@@ -0,0 +1,12 @@
+package com.hz.his.dto.user;
+
+import lombok.Data;
+
+import java.util.List;
+
+
+/**浜虹兢鍖呯敤鎴锋煡璇㈠弬鏁�*/
+@Data
+public class UserPackListDto {
+ private List<UserPackDto> list;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsUsedCouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsUsedCouponDto.java
index 0fe5bfb..2d2dfc9 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsUsedCouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsUsedCouponDto.java
@@ -14,6 +14,8 @@
public class GoodsUsedCouponDto extends PageDto {
/**鐢ㄦ埛鏍囪瘑*/
private String userId;
+ /**鍥㈣喘娲诲姩鏍囪瘑*/
+ private String groupBuyId;
/**鍟嗗搧绫诲瀷*/
private Integer goodType;
/**his鍟嗗搧绫诲瀷*/
@@ -21,5 +23,7 @@
/**骞冲彴*/
private String platform;
/**sku鏍囪瘑*/
+ private List<String> couponIdList;
+ /**sku鏍囪瘑*/
private List<GoodsCanUseCouponDto> goodsCanUseCouponDtoList;
}
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 2574514..5ec403f 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,6 +95,8 @@
public static final String OPERATION_REASON_CHANGE = "changeGoods";
/**鎿嶄綔鏂瑰紡-鐢熸棩璧犻��*/
public static final String OPERATION_REASON_BIRTHDAY_GIFT = "birthdayGift";
-
+ /**鎿嶄綔鏂瑰紡-鑰佸甫鏂拌禒閫�0701*/
public static final String OPERATION_REASON_GIFT_0701 = "bringNewUserGift_0701";
+ /**鎿嶄綔鏂瑰紡-娲诲姩鍙備笌*/
+ public static final String OPERATION_REASON_ACTIVITY_JOIN = "activity_join";
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectDto.java
index c794249..1b43d90 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectDto.java
@@ -30,13 +30,12 @@
private String orderId;
/**鐘舵��*/
private Integer status;
- //鏄惁SPA(0:鍚�,1:鏄�)
+ /**鏄惁SPA(0:鍚�,1:鏄�)*/
private Integer isSpa;
-
-
- //鐢ㄦ埛鎵�灞炲瓙椤圭洰id(UserProjectItem)
+ /**鐢ㄦ埛鎵�灞炲瓙椤圭洰id(UserProjectItem)*/
private String userProjectItemId;
-
+ /**鏄惁澶勭悊钄″尰鐢熷悕绉�*/
+ private Integer handlerDoctorName = 0;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java
new file mode 100644
index 0000000..16bc710
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java
@@ -0,0 +1,24 @@
+package com.hz.his.feign.service.marketing;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.marketing.common.MarketingTotalDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 钀ラ攢鍔╂墜瀹℃牳鎺ュ彛
+ */
+@FeignClient(name="marketing-assistant-user",path = "/m_assistant",contextId = "m-common")
+public interface MCommonService {
+
+ /**
+ * 缁熶竴鐢宠瀹℃牳鎺ュ彛
+ */
+ @PostMapping(value = "/common/apply")
+ Result applyOrderDiscount(@RequestBody MarketingTotalDto marketingTotalDto);
+
+
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SChannelsService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SChannelsService.java
index d8386a2..eb87393 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SChannelsService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SChannelsService.java
@@ -2,6 +2,8 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.PageDto;
+import com.hz.his.dto.channel.ChannelDto;
+import com.hz.his.dto.channel.ChannelGeneralDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -27,4 +29,18 @@
*/
@PostMapping(value = "/channels/list")
Result getChannelsList(@RequestBody PageDto pageDto);
+
+ /**
+ * 鑾峰彇娓犻亾鍒楄〃-娓犻亾澶х被
+ * @return Result
+ */
+ @PostMapping(value = "/channels/type/list")
+ Result getChannelsListByType(@RequestBody PageDto pageDto);
+
+ /**
+ * 鑾峰彇娓犻亾鍒楄〃-鍒ゆ柇鏄惁褰掑睘
+ * @return Result
+ */
+ @PostMapping(value = "/channels/type/check")
+ Result checkInChannel(@RequestBody ChannelGeneralDto channelGeneralDto);
}
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/SCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
index 0d4f469..ee1befb 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
@@ -124,4 +124,10 @@
/*涓嬪崟鏍￠獙浼樻儬鍒告槸鍚﹀彲鐢�*/
@PostMapping(value = "/coupon/order/check")
Result orderCheck(@RequestBody(required = false) CouponListDto couponListDto);
+
+ /**
+ * 鏌ョ湅鍟嗗搧璇︽儏鐢ㄦ埛鍙敤浼樻儬鍒�
+ */
+ @PostMapping(value = "/coupon/user/goods")
+ Result findUserGoodsCoupon(@RequestBody(required = false) GoodsUsedCouponDto dto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SDoctorTimeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SDoctorTimeService.java
new file mode 100644
index 0000000..436ebb1
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SDoctorTimeService.java
@@ -0,0 +1,49 @@
+package com.hz.his.feign.service.phis;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.doctorTime.DoctorTimeDto;
+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;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName SActivityController
+ * @Description 娲诲姩瑙勫垯
+ * @Author Wrh
+ * @Date 2022/8/8 17:36
+ * @Version 1.0
+ */
+@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "doctorTime")
+public interface SDoctorTimeService {
+
+ /**
+ * 鑾峰彇鍖荤敓鎺掔彮鍒楄〃
+ * @return Result
+ */
+ @PostMapping(value = "/doctor/time/list")
+ Result list(@RequestBody DoctorTimeDto dto);
+
+ /**
+ * 鍖荤敓鎺掔彮鏃堕棿淇℃伅
+ * @return Result
+ */
+ @PostMapping(value = "/doctor/time/info")
+ Result info(@RequestBody DoctorTimeDto dto);
+
+ /**
+ * 鍒ゆ柇鍖荤敓鎺掔彮鏃堕棿鏄惁琚崰鐢�
+ * @return Result
+ */
+ @PostMapping(value = "/doctor/time/checkTimeIsHasAppointment")
+ Result checkTimeIsHasAppointment(@RequestBody DoctorTimeDto dto);
+
+ /**
+ * 鍖荤敓鎺掔彮鏃堕棿璇︽儏
+ * @return Result
+ */
+ @PostMapping(value = "/doctor/time/details")
+ Result details(@RequestBody DoctorTimeDto dto);
+}
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 ab4bd11..6309cc7 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
@@ -19,6 +19,8 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
+import java.util.List;
+
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
@@ -255,6 +257,13 @@
@PostMapping(value = "/user/crowd/import")
Result userCrowdImport(@RequestBody UserDto userDto);
+ /**
+ * 鑾峰彇鐢ㄦ埛淇℃伅锛屽鍏ヤ汉缇ゅ寘涓撶敤
+ * 鏍规嵁CIQ鎴栬�呭悕绉板叏鍖归厤鏌ユ壘鐢ㄦ埛
+ */
+ @PostMapping(value = "/user/crowd/import/new")
+ Result userCrowdImportNew(@RequestBody UserPackListDto userPackListDto);
+
/**
* 鑾峰彇鐢ㄦ埛瀛愰」鐩�
@@ -269,6 +278,12 @@
*/
@PostMapping(value = "/user/info/baseInfo")
Result userInfoBaseInfo(@RequestParam("userId") String userId);
+
+ /**
+ * 鑾峰彇鍒扮敤鎴�
+ */
+ @PostMapping(value = "/user/sync/by/idList")
+ Result userSyncList(@RequestBody List<String> hisIdList);
/**
* 鍒ゆ柇鐢ㄦ埛鏄惁鏄細鍛�
@@ -319,4 +334,10 @@
* */
@PostMapping(value = "/user/rebate/userId")
Result queryRebateByUserId(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛绱杩斾剑
+ * */
+ @PostMapping(value = "/user/query/oldNewPerformance")
+ Result queryOldNewPerformance(@RequestBody UserDto userDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipAppointmentService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipAppointmentService.java
new file mode 100644
index 0000000..446257a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipAppointmentService.java
@@ -0,0 +1,19 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.appointment.AppointmentCrmAddDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @USER: fhx
+ * @DATE: 2023/7/6
+ **/
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-appointment")
+public interface SPhipAppointmentService {
+
+ /** CRM棰勭害 */
+ @PostMapping("/appointment/crm/app")
+ Result crmApp(@RequestBody AppointmentCrmAddDto dto);
+}
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..0c30dc8 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,16 @@
*/
@PostMapping(value = "/coupon/check/coupon")
Result checkCoupon(@RequestBody CouponDto couponDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-璁㈠崟鍙戞斁浼樻儬鍒�
+ */
+ @PostMapping(value = "/coupon/order/send/coupon")
+ Result orderSendCoupon(@RequestBody OrderSendCouponDto couponDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-妫�鏌ヤ紭鎯犲埜鏄惁鍙敤 - 寮�鍗曠粨璐﹀悓鏃舵墽琛屼娇鐢�
+ */
+ @PostMapping(value = "/coupon/check/coupon/to/orderAndPay")
+ Result checkCouponToOrderAndPay(@RequestBody CouponDto couponDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java
index a347d90..a3397c3 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java
@@ -24,7 +24,6 @@
@PostMapping(value = "/deduction/customer/confirm/all")
Result customerConfirmAll(@RequestBody DeductionDto dto);
-
/**
* 瀹㈡埛纭鍒掓墸涔嬪墠椤甸潰鏁版嵁
*/
@@ -32,8 +31,38 @@
Result customerConfirmBefore(@RequestBody DeductionDto dto);
/**
+ * 瀹㈡埛纭鍒掓墸涔嬪墠椤甸潰鏁版嵁鎵�鏈夋湭纭鏁版嵁
+ */
+ @PostMapping(value = "/deduction/customer/confirm/all/before")
+ Result customerConfirmAllBefore(@RequestBody DeductionDto dto);
+
+ /**
* 鑾峰彇鐢ㄦ埛鍒掓墸淇℃伅涔嬪墠鐨勫尰鐢熶俊鎭�
*/
@PostMapping(value = "/deduction/project/before/doctor/info")
Result projectBeforeDoctorInfo(@RequestBody DeductionDto dto);
+
+ /**
+ * 鏂板鍒掓墸璁板綍
+ */
+ @PostMapping(value = "/deduction/add")
+ Result addData(@RequestBody DeductionDto dto);
+
+ /**
+ * 淇敼鍒掓墸璁板綍
+ */
+ @PostMapping(value = "/deduction/update")
+ Result updateData(@RequestBody DeductionDto dto);
+
+ /**
+ * 浣滃簾鍒掓墸璁板綍
+ */
+ @PostMapping(value = "/deduction/rescinded")
+ Result rescindedData(@RequestBody DeductionDto dto);
+
+ /**
+ * 鍒犻櫎鍒掓墸璁板綍
+ */
+ @PostMapping(value = "/deduction/delete")
+ Result deleteData(@RequestBody DeductionDto dto);
}
\ 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 6e97dc9..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
@@ -179,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/SPhipUserCardService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java
index 0fb33a9..3e6fbac 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java
@@ -26,11 +26,17 @@
Result delayCardBag(@RequestBody CardBagDto cardBagDto);
/**
- * 寮�鏀惧钩鍙�-鍗″寘鍙姷鎵ｄ俊鎭�
+ * 寮�鏀惧钩鍙�-鍗″寘鍙姷鎵ｄ俊鎭紙鍗曟潯锛�
* @return 杞寲瀵硅薄UserCardVo
*/
@PostMapping(value = "/user/card/get/deduction-data")
Result deductionData(@RequestBody CardBagDto cardBagDto);
+ /**
+ * 寮�鏀惧钩鍙�-鍗″寘鍙姷鎵ｄ俊鎭紙闆嗗悎锛�
+ * @return 杞寲瀵硅薄userCardMapVo
+ */
+ @PostMapping(value = "/user/card/get/deduction-data/list")
+ Result deductionDataList(@RequestBody CardBagDto cardBagDto);
}
\ 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 074a4f0..70b272f 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
@@ -102,4 +102,10 @@
*/
@PostMapping(value = "/user/level/calc")
Result userLevelCalc(@RequestBody UserParamDto userParamDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鑾峰彇鐢ㄦ埛鐨勫叕浼楀彿淇℃伅
+ */
+ @PostMapping(value = "/user/gzh/info")
+ Result userGZHInfo(@RequestBody UserParamDto userParamDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SWxTokenService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SWxTokenService.java
index 8cdec51..4a08b02 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SWxTokenService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SWxTokenService.java
@@ -27,6 +27,15 @@
@RequestHeader(name = "appIdCode",required = false) String appIdCode);
/**
+ *鑾峰彇灏忕▼搴忎紒涓氬井淇″簲鐢╰oken
+ * 杞寲浣跨敤 WxTokenDt
+ * @param getTokenDto 瀵硅薄
+ * @return
+ */
+ @PostMapping(value = "/account_token/apply/get_token")
+ Result corpApplyToken(@RequestBody GetTokenDto getTokenDto);
+
+ /**
*鑾峰彇灏忕▼搴忔櫘閫歵oken
* 杞寲浣跨敤 WxTokenDt
* @param getTokenDto 瀵硅薄
@@ -37,6 +46,15 @@
@RequestHeader(name = "appId",required = true) String appId,
@RequestHeader(name = "sign",required = true) String sign,
@RequestHeader(name = "appIdCode",required = false) String appIdCode);
+
+ /**
+ *鑾峰彇灏忕▼搴忔櫘閫歵oken
+ * 杞寲浣跨敤 WxTokenDt
+ * @param getTokenDto 瀵硅薄
+ * @return
+ */
+ @PostMapping(value = "/account_token/mp/get_token")
+ Result mpToken(@RequestBody GetTokenDto getTokenDto);
/**
@@ -52,6 +70,15 @@
@RequestHeader(name = "appIdCode",required = false) String appIdCode);
/**
+ *鑾峰彇鍏紬鍙锋櫘閫歵oken
+ * 杞寲浣跨敤 WxTokenDt
+ * @param getTokenDto 瀵硅薄
+ * @return
+ */
+ @PostMapping(value = "/account_token/weChat/get_token")
+ Result weChatToken(@RequestBody GetTokenDto getTokenDto);
+
+ /**
*鑾峰彇浼佷笟寰俊閫氳褰晅oken
* 杞寲浣跨敤 WxTokenDt
* @param getTokenDto 瀵硅薄
@@ -64,6 +91,15 @@
@RequestHeader(name = "appIdCode",required = false) String appIdCode);
/**
+ *鑾峰彇浼佷笟寰俊閫氳褰晅oken
+ * 杞寲浣跨敤 WxTokenDt
+ * @param getTokenDto 瀵硅薄
+ * @return
+ */
+ @PostMapping(value = "/account_token/communi/get_token")
+ Result corpCommonToken(@RequestBody GetTokenDto getTokenDto);
+
+ /**
*鑾峰彇浼佷笟寰俊鑱旂郴鎴憈oken
* 杞寲浣跨敤 WxTokenDt
* @param getTokenDto 瀵硅薄
@@ -75,4 +111,13 @@
@RequestHeader(name = "sign",required = true) String sign,
@RequestHeader(name = "appIdCode",required = false) String appIdCode);
+ /**
+ *鑾峰彇浼佷笟寰俊鑱旂郴鎴憈oken
+ * 杞寲浣跨敤 WxTokenDt
+ * @param getTokenDto 瀵硅薄
+ * @return
+ */
+ @PostMapping(value = "/account_token/contact/get_token")
+ Result corpContactToken(@RequestBody GetTokenDto getTokenDto);
+
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java
index cf291b0..a5677db 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java
@@ -82,4 +82,11 @@
@PostMapping("/admin/export/employee/user/member/distribution/proportion")
Result memberDistributionProportion(@RequestBody UserReleaseDto userReleaseDto);
+ /**
+ * 鍜ㄨ甯�-鑰佸甫鏂颁笟缁�
+ * 杩斿洖鎺ュ彛Result.success(data); data鏄釜map,key涓哄憳宸ユ爣璇�,value鏄噾棰�
+ */
+ @PostMapping("/admin/export/employee/oldNew/report")
+ Result oldNewReport(@RequestBody EmployeeReportDto employeeReportDto);
+
}
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 85d552e..6f2fbd0 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
@@ -100,4 +100,21 @@
@PostMapping("/admin/consultant/report/user/doctor/deduction/list/month")
Result userDoctorDeductionMonthList(@RequestBody EmployeeReportDto employeeReportDto);
+ /**鍜ㄨ甯�-寰俊钀ラ攢鏁版嵁*/
+ @PostMapping("/admin/consultant/report/weChat/list")
+ Result weChatList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**鍜ㄨ甯�-瀵煎嚭-鏍稿績椤圭洰鎻愬強鐜�*/
+ @PostMapping("/admin/consultant/report/weChat/list/export")
+ Result weChatListExport(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**鍜ㄨ甯�-鍜ㄨ甯�-娴佸け瀹㈡埛瀵煎嚭*/
+ @PostMapping("/admin/consultant/report/loss/user/rate/export")
+ Result lossUserListExport(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**鍜ㄨ甯�-鍜ㄨ甯�-绉戝涓氱哗*/
+ @PostMapping("/admin/consultant/report/room/list")
+ Result roomList(@RequestBody EmployeeReportDto employeeReportDto);
+
+
}
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 2f55d29..8acf876 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
@@ -89,4 +89,15 @@
@PostMapping("/admin/export/shop/user/doctor/deduction/list/month")
Result userDoctorDeductionMonthList(@RequestBody ShopReportDto shopReportDto);
+ /**
+ * 闂ㄥ簵-娴佸け瀹㈡埛-瀵煎嚭
+ */
+ @PostMapping("/admin/export/shop/loss/user/rate/export")
+ Result lossUserRate(@RequestBody ShopReportDto shopReportDto);
+
+ /**闂ㄥ簵-绉戝涓氱哗*/
+ @PostMapping("/admin/export/shop/room/list")
+ Result roomList(@RequestBody ShopReportDto shopReportDto);
+
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java
new file mode 100644
index 0000000..d02644e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java
@@ -0,0 +1,22 @@
+package com.hz.his.feign.service.platform.payment;
+
+import com.hx.resultTool.Result;
+import com.hz.his.vo.payment.PayNoVo;
+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 = "pay-no")
+public interface SPayNoService {
+
+ /**
+ * 鑾峰彇鏀粯缂栧彿锛屽彧杩斿洖鏀粯缂栧彿
+ * data灏辨槸鏀粯缂栧彿
+ */
+ @PostMapping(value = "/pay/create")
+ Result payCreate(@RequestBody PayNoVo payNoVo);
+
+}
\ 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
index 4761502..588e536 100644
--- 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
@@ -24,7 +24,7 @@
* 寮�鏀惧钩鍙�-纭鎻愪氦閫�娆�
* data 鏃犲疄浣撹浆鍖栫敤
*/
- @PostMapping(value = "/confirm")
+ @PostMapping(value = "/card/refund/confirm")
Result refundConfirm(@RequestBody RefundUserCardVo refundUserCardVo);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java b/phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java
new file mode 100644
index 0000000..64d06f3
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java
@@ -0,0 +1,34 @@
+package com.hz.his.vo.payment;
+
+import lombok.Data;
+
+/**
+ * @author CJH
+ */
+@Data
+public class PayNoVo {
+ /**Y-璁㈠崟鍙�*/
+ private String orderNo;
+ /**Y-鍙犲姞闀垮害锛屽湪orderNo鍚庨潰娣诲姞闀垮害锛岄粯璁�6锛屾病鏈夌壒娈婅姹傞兘鏄粯璁�6*/
+ private Integer lengrhCount = 6;
+ /**Y-浜ゆ槗鏂瑰紡*/
+ private String payWay;
+
+ /**Y-鍏宠仈绫诲瀷*/
+ private Integer type;
+ /**Y-鍏宠仈绫诲瀷鏍囪瘑*/
+ private String typeId;
+
+
+ /**鍏宠仈绫诲瀷-鎬昏鍗�*/
+ public static final int TYPE_ORDER = 0;
+
+ /**浜ゆ槗鏂瑰紡-寰俊*/
+ public static final String PAY_WAY_WECHAT = "WECHAT";
+ /**浜ゆ槗鏂瑰紡-鏀粯瀹�*/
+ public static final String PAY_WAY_ALIPAY = "ALIPAY";
+ /**浜ゆ槗鏂瑰紡-閾惰仈*/
+ public static final String PAY_WAY_UNIONPAY = "UNIONPAY";
+ /**浜ゆ槗鏂瑰紡-鏁板瓧浜烘皯甯�*/
+ public static final String PAY_WAYE_EC = "EC";
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java
index 7f60784..683645f 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java
@@ -21,8 +21,12 @@
private Integer deductionNum;
/**鐢ㄦ埛鍗￠」鏉＄洰-鍗曟鎶垫墸娆℃暟*/
private Integer deductionSingle;
- /**鐢ㄦ埛鍗￠」鏉＄洰-宸叉姷鎵ｆ鏁�*/
+ /**鐢ㄦ埛鍗￠」鏉＄洰-宸叉姷鎵ｆ鏁�(鍏ㄩ儴)*/
private Integer usedNum;
+ /**鍗″寘-璇ュ崱椤规潯鐩凡浣跨敤娆℃暟锛堜笉鍖呮嫭閫�娆撅級*/
+ private Integer usedNumNoRefund;
+ /**鍗″寘-璇ュ崱椤规潯鐩凡閫�娆惧弬鏁�*/
+ private Integer usedNumRefund;
/**鍓╀綑鍙姷鎵ｆ�绘鏁�*/
private Integer surplusNum;
diff --git a/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardVo.java b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardVo.java
index ecdba91..982b63a 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardVo.java
@@ -18,6 +18,19 @@
private String cardName;
/**鍗￠」-鎬婚噾棰�*/
private BigDecimal total;
+
+ /**鍗″寘-鐘舵��*/
+ private Integer effectiveStatus;
+
+ /**鍗″寘鎵�灞炵敤鎴�-鏍囪瘑*/
+ private String userId;
+ /**鍗″寘鎵�灞炵敤鎴�-鍚嶇О*/
+ private String userName;
+ /**鍗″寘鎵�灞炵敤鎴�-CIQ*/
+ private String userCiq;
+ /**鍗″寘鎵�灞炵敤鎴�-鐢ㄦ埛鎵�灞為棬搴�*/
+ private String userShopId;
+
/**鍏宠仈鐨勬潈鐩�*/
private List<UserCardEquityVo> userCardEquityVoList;
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsAssocDt.java b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsAssocDt.java
new file mode 100644
index 0000000..c980f9c
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsAssocDt.java
@@ -0,0 +1,30 @@
+package com.hz.phis.dt.consumables;
+
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
+import lombok.Data;
+
+/**
+ * 鍟嗗搧鍏宠仈缁勫悎
+ * @USER: fhx
+ * @DATE: 2023/7/12
+ **/
+@Data
+public class GoodsAssocDt {
+
+ /** 鑰楁潗琛ㄦ爣璇�(Consumables) */
+ private String consumableId;
+ /** 鍏宠仈绫诲瀷 */
+ public String commonType;
+ /** 鍏宠仈鏍囪瘑(浼樻儬鍒竔d) */
+ public String commonId;
+ /** 鍏宠仈鍚嶇О */
+ public String commonName;
+ /** 鏁伴噺 */
+ public Integer quantity;
+
+
+ //////////////////////////////////
+ /** 鍏宠仈绫诲瀷 - 浼樻儬鍒� */
+ public static final String COMMON_TYPE_COUPON = "coupon";
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDeLimitDt.java b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDeLimitDt.java
index 8284598..66d5616 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDeLimitDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDeLimitDt.java
@@ -3,6 +3,8 @@
import com.hz.phis.dt.limit.LimitDt;
import lombok.Data;
+import java.util.List;
+
/**
* 鍟嗗搧璇︽儏闄愬埗瀹炰綋
* @author fwq
@@ -14,4 +16,7 @@
private GoodsDetailDt consumables;
/**闄愬埗淇℃伅*/
private LimitDt limitBo;
+ /** 鍟嗗搧鍏宠仈淇℃伅 */
+ private List<GoodsAssocDt> assocList;
+
}
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 091e66d..8f95aba 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
@@ -84,6 +84,9 @@
private Date firstPayOrderTime;
//鏈�鍚庝竴娆℃墽琛屾椂闂�
private Date lastDeductionTime;
-
+ //openId
+ private String openId;
+ //鍏紬鍙穙penId
+ private String gzhOpenId;
}
--
Gitblit v1.8.0