phis-feign/src/main/java/com/hz/his/dto/card/CardQueryDto.java
New file @@ -0,0 +1,22 @@ package com.hz.his.dto.card; import com.hz.his.dto.PageDto; /** * 卡项查询参数 * @author fwq */ public class CardQueryDto extends PageDto { /**卡项标识*/ private String cardId; public String getCardId() { return cardId; } public void setCardId(String cardId) { this.cardId = cardId; } } phis-feign/src/main/java/com/hz/his/dto/consumables/GoodsQueryDto.java
New file @@ -0,0 +1,22 @@ package com.hz.his.dto.consumables; import com.hz.his.dto.PageDto; /** * 商品查询参数 * @author fwq */ public class GoodsQueryDto extends PageDto { /**商品标识*/ private String goodsId; public String getGoodsId() { return goodsId; } public void setGoodsId(String goodsId) { this.goodsId = goodsId; } } phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
@@ -1,14 +1,29 @@ package com.hz.his.dto.coupon; import com.hz.his.dto.PageDto; import lombok.Data; import java.util.List; /** * 优惠券发送参数 * @author fwq * 优惠券扩展 * */ */ @Data public class CouponDto extends PageDto { /**操作人标识*/ private String operatorId; /**操作人名称*/ private String operatorName; /**发送记录*/ private CouponRecordDto couponReleaseRecordItem; /**用户详情*/ private List<UserArrDto> userArr; /**来源编码,商户自定义服务来源标识*/ private String appIdCode; /**修改时间*/ private String updateTime; phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
New file @@ -0,0 +1,19 @@ package com.hz.his.dto.coupon; import lombok.Data; /** * 优惠券 * * @author fwq */ @Data public class CouponRecordDto { /**优惠券标识*/ private String couponId; /**批次号名称*/ private String recordName; /**公共标识*/ private String commonId; } phis-feign/src/main/java/com/hz/his/dto/coupon/UserArrDto.java
New file @@ -0,0 +1,36 @@ package com.hz.his.dto.coupon; import com.hz.his.dto.PageDto; import lombok.Data; /** * @ClassName UserArrDto * @Description 发送优惠券用户数组dto * @Author Wrh * @Date 2022/7/15 18:40 * @Version 1.0 */ @Data public class UserArrDto extends PageDto { /**用户图片*/ private String imgUrl; /**用户性别1男2女0未知*/ private Integer gender; /**创建时间*/ private String createTime; /**用户名称*/ private String name; /**用户手机号*/ private String tel; /**用户标识*/ private String id; /**用户hisId*/ private String apiId; /**是否发送短信 1是0否*/ private Integer isSendSMS; /**数量发送优惠券数量*/ private Integer amount; } phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java
New file @@ -0,0 +1,84 @@ package com.hz.his.dto.order; import lombok.Data; import java.math.BigDecimal; /** * 订单信息 * @author wzh */ @Data public class OrderItemDto { /** id */ private String id; /** 订单编号,以SO)开头, SOyyyyMMdd0000000 */ private String orderNo; /** 商品类型(OrderItemConstants) */ private String type; /** 项目编号/商品编码/套餐编码/其他编码 */ private String goodsNo; /** 项目名称/商品名称 */ private String goodsName; /** 项目主图/商品图片 */ private String goodsImage; /** 规格,冗余字段(格式:[{'specsId':‘规格标识’,'specsTitle':'规格名称,'specsValue':'规格值','unit':'单位'}]) */ private String specs = "[]"; /** 身体部位标识 */ private String bodyPartsId; /** 身体部位名称 */ private String bodyPartsName; /** 支付状态(OrderTotalConstants) */ private Integer payStatus; /** 退款状态 */ private Integer refundStatus; /** 订单总金额 */ private BigDecimal total; /** 实付金额 */ private BigDecimal actualTotal; /** 原价 */ private BigDecimal userPaidTotal; /** 原价 */ private BigDecimal oriPrice; /** 现价 */ private BigDecimal curPrice; /** 项目/商品疗程单次数(疗程次数,默认为0) */ private Integer single; /** 折扣(单位:百分比) */ private BigDecimal discount; /** 总次数(疗程次数,默认为0) */ private Integer usedTotal; /** 购买数量 */ private Integer buyNum; /** 子项订单备注 */ private String remarks; /** 项目id/商品id/套餐标识/其他标识(公用标识) */ private String commonId; /** 执行条目ID */ private String performId; /** 订单id(OrdersTotal) */ private String orderId; /** 转入门店id */ private String transferIntoShopId; /** 转入门店名称 */ private String transferIntoShopName; /** 是否转疗 */ private Integer isTransfer; /** 是否转赠 */ private Integer isTurn; } phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
New file @@ -0,0 +1,23 @@ package com.hz.his.dto.order; import lombok.Data; import java.math.BigDecimal; /** * @author wzh * 订单结账扩展 */ @Data public class OrderItemRefundDto { /** 子订单id */ private String orderItemId; /** 实退数 */ private Integer refundNum; /** 实退金额 */ private BigDecimal refundMoney; /** 实退原因 */ private String refundReason; } phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java
New file @@ -0,0 +1,26 @@ package com.hz.his.dto.order; import lombok.Data; import java.math.BigDecimal; /** * @author wzh * 退回支付记录扩展 */ @Data public class OrderPayMethodDto { /** 支付方式编码 */ private String payMethodNo; /** 实退金额 */ private BigDecimal money; public OrderPayMethodDto() { } public OrderPayMethodDto(String payMethodNo, BigDecimal money) { this.payMethodNo = payMethodNo; this.money = money; } } phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
New file @@ -0,0 +1,27 @@ package com.hz.his.dto.order; import lombok.Data; import java.util.List; /** * @author wzh * 订单结账扩展 */ @Data public class OrderRefundDto { /** 退款方式集合 */ private List<OrderPayMethodDto> refundPayMethod; /** 备注 */ private String remarks; /** 退款信息集合 */ private List<OrderItemRefundDto> refundList; /** 订单id */ private String orderId; /** 退款类型(0:退次数退款,1:仅退款 默认:0) */ private Integer refundType; /** 操作人id */ private String operatorId; } phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java
New file @@ -0,0 +1,168 @@ package com.hz.his.dto.order; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.util.Date; /** * 总订单 * @author wzh */ @Data public class OrdersTotalDto { /** 订单id */ private String id; /** 订单编号,以S开头, SyyyyMMdd0000000(前缀从字典获取) */ private String orderNo; /** 订单类型(OrderTotalConstants) */ private String type; /** 状态(OrderTotalConstants) */ private Integer status; /** 支付状态(OrderTotalConstants) */ private Integer payStatus; /** 支付时间 */ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date payTime; /** 退款状态 */ private Integer refundStatus; /** 取消时间/作废时间 */ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date cancelTime; /** 订单总金额,以元为存储(全部金额,包括优惠价格) */ private BigDecimal total; /** 应付总金额,以元为存储(payTotal+其他支付模式) */ private BigDecimal shouldTotal; /** 已支付总金额,以元为存储(payTotal+其他支付模式) */ private BigDecimal actualTotal; /** 已支付现金金额(微信/支付宝支付/其他),以元为存储 默认:0 */ private BigDecimal payTotal; /** 已支付储值金金额 默认:0 */ private BigDecimal payRecharge; /** 已支付增值金金额 默认:0 */ private BigDecimal payIncrement; /** 优惠金额,以元为存储 */ private BigDecimal discountTotal; /** 活动规则优惠总金额 */ private BigDecimal activityTotal; /** 赠送金额 */ private BigDecimal givingAmount; /** 赠送金额类型(GivingAmountType) */ private String givingType; /** 所属门店标识(Shop)(操作人的门店名称) */ private String shopId; /** 所属门店名称(操作人的门店名称) */ private String shopName; /** 操作类型(0:系统管理员,1:员工,3:第三方平台) */ private Integer operatorType; /** 下单操作人标识(Employee) */ private String operatorId; /** 下单操作人名称 */ private String operatorName; /** 开发人门店标识(Shop,没有传值默认用户绑定销售顾问的门店) */ private String developerShopId; /** 开发人门店名称(没有传值默认用户绑定销售顾问的门店) */ private String developerShopName; /** 开发人标识(Shop,没有传值默认用户绑定销售顾问的标识) */ private String developerId; /** 开发人名称(没有传值默认用户绑定销售顾问的名称) */ private String developerName; /*平台来源**/ /** 来源应用appId(创建订单平台,系统默认) */ private String appId; /** 来源应用编码(商户设置平台编码,系统默认,代码必填) */ private String appIdCode; /*销售订单来源,销售可以选择*/ /** 订单来源代码(默认:应用appId) */ private String sourceCode; /** 订单来源名称(冗余) */ private String sourceName; /** 第三方订单号 */ private String sourceOrderNo; /** 兑换码(第三方兑换码) */ private String conversionCode; /** 渠道来源类型(OrderTotalConstants) */ private String channelType; /** 渠道标识(渠道/用户) */ private String commonId; /** 渠道来源名称(渠道/用户) */ private String commonName; /** 科室编码 */ private String departmentCode; /** 科室名称 */ private String departmentName; /** 美容师标识 */ private String beauticianId; /** 美容师名称 */ private String beauticianName; /** 医生标识 */ private String doctorId; /** 医生名称 */ private String doctorName; /** 同步状态0否1是 */ private int hisSynStatus; /** 同步his订单号 */ private String hisOrderId; /** 预约订单标识 */ private String appointmentId; /** 剩余储值金,以元保留2位小数为单位存储加密后的字符串 */ private String storedValueFund; /** 剩余增值金,以元保留2位小数为单位存储加密后的字符串 */ private String valueAddedFund; /** 剩余积分,以元保留2位小数为单位存储加密后的字符串 */ private String integral; /** 会员等级 */ private String userLevel; /** CID */ private String CIQ; /** 订单备注 */ private String remarks; /** 推荐人标识 */ private String inviteeId; /** 推荐人名称(冗余) */ private String inviteeName; /** 推荐人所属类型(UserChannelType) */ private String userBelongingType; /** 用户Id */ private String userId; /** 同步状态(OrderTotalConstants) */ private Integer syncStatus; /** 康博佳标识(KoapOrderTotal) */ private String koapOrderId; } phis-feign/src/main/java/com/hz/his/dto/project/ProjectQueryDto.java
New file @@ -0,0 +1,22 @@ package com.hz.his.dto.project; import com.hz.his.dto.PageDto; /** * 项目查询参数 * @author fwq */ public class ProjectQueryDto extends PageDto { /**项目标识*/ private String projectId; public String getProjectId() { return projectId; } public void setProjectId(String projectId) { this.projectId = projectId; } } phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionQueryDto.java
New file @@ -0,0 +1,22 @@ package com.hz.his.dto.promotion; import com.hz.his.dto.PageDto; /** * 促销查询参数 * @author fwq */ public class PromotionQueryDto extends PageDto { /**促销标识*/ private String promotionId; public String getPromotionId() { return promotionId; } public void setPromotionId(String promotionId) { this.promotionId = promotionId; } } phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
New file @@ -0,0 +1,252 @@ package com.hz.his.dto.user; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; /** * 用户参数 * @author wzh */ @Data public class UserParamDto { /** 用户id */ private String userId; /** 姓名 */ private String name; /** 主电话号码 */ private String tel; /** 来源信息 */ private UserUnionDto userUnion; /** 图片 */ private String imgUrl; /** 会员等级 */ private String userLevel; /** 星级,100为1星,150为1.5星 */ private Integer starLevel; /** 用户类型 */ private String userType; /** 来源id */ private String channelId; /** 来源 */ private String channelType; /** 二级来源id */ private String channel2Id; /** 二级来源 */ private String channelType2; /** QQ */ private String QQ; /** 性别 */ private Integer gender = SEX_WUMAN; /** CIQ */ private String CIQ; /** 会员号 */ private String memberNO; /** 备注 */ private String remark; /** 消费金额 */ private String money; /** 上一次预约的医生 */ private String lastDoctorId; /** 上一次预约的顾问 */ private String lastCorpUserId; /** 证件类型 */ private Integer certificateType; /** 证件编号 */ private String certificateNo; /** 生日yyyy-MM-dd" */ private String birthDay; /** 工作人员Id */ private String corpUserId; /** 接口id */ private String apiId; /** 所属顾问(销售顾问) */ private String hisCorpUserId; /** 客户开发人员工id */ private String customerDeveloperId; /** 所属门店id */ private String shopId; /** 用户角色 */ private Integer userRole; /** 拼音码*/ private String pinyinCode; /** 电网咨询顾问 */ private String internetCorpUserId; /** 所属美容师*/ private String beauticianCorpUserId; /** 客服专员 */ private String chatCorpUserId; /** 咨询助理 */ private String consultCorpUserId; /** 共享客户 */ private Integer shareCustomer = 0; /** 所属护士 */ private String nurseCorpUserId; /** 所属医生 */ private String doctorCorpUserId; /** 咨询师隶属 */ private String consultBelonging; /** 国家类型名称 */ private String countryTypeName; /** 语言类型名称 */ private String languageTypeName; /** 用户年龄 */ private Integer year = 0; /** 星座类型名称 */ private String constellationTypeName; /** 民族类型名称 */ private String nationalityTypeName; /** 职业类型名称 */ private String professionTypeName; /** 收入类型名称 */ private String incomeTypeName; /** 婚姻类型名称 */ private String marriageTypeName; /** 生育类型名称 */ private String growthTypeName; /** 籍贯类型名称 */ private String nativePlaceTypeName; /** 单位名称 */ private String unitName; /** 泊车需求 */ private Integer isHaveCar = 0; /** 车牌号码 */ private String carNumber; /** 过敏标签 */ private String allergyLabel; /** 印象标签 json */ private String impressionLabelJson; /** 用户兴趣爱好json */ private String userInterestsJson; /** email */ private String email; /** 商务通编号 */ private String merchantNo; /** 固定电话 */ private String telPhone; /** wechat */ private String wechat; /** Line */ private String line; /** 联络方式 */ private String contactType; /** 用户地址 json */ private String addressJson; /** 次要电话簿 json */ private String phoneBooksJson; @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") /** 更新时间 */ private Date updateTime; /** 邀请人id 用户,员工 */ private String inviteeId; /** 渠道来源类型 */ private String channelCategory= CATEGORY_ONESELF; /** 性别0未知1男2女 */ private Integer sex; /** 会员名称 */ private String memberLevel; /** 搜索:做过项目 */ private String projectName; /** 用户消费时间(开始),格式:yyyy-MM-dd HH:mm:ss */ private String consumeStartTime; /** 搜索:用户创建时间(开始),格式:yyyy-MM-dd HH:mm:ss */ private String createStartTime; /** 搜索:用户创建时间(结束),格式:yyyy-MM-dd HH:mm:ss */ private String createEndTime; /**性别-未知*/ public static final Integer SEX_UNKNOWN = 0; /**性别-男*/ public static final Integer SEX_MAN = 1; /**性别-女*/ public static final Integer SEX_WUMAN = 2; /**渠道类别-渠道*/ public static final String CATEGORY_CHANNEL = "channel"; /**渠道类别-会员*/ public static final String CATEGORY_MEMBERS = "members"; /**渠道类别-员工*/ public static final String CATEGORY_EMPLOYEE = "employee"; /**渠道类别-自己来*/ public static final String CATEGORY_ONESELF = "oneself"; /*用户注册推荐人id*/ private String referrerId; /*同步领建的参数*/ private boolean internal; } phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java
New file @@ -0,0 +1,48 @@ package com.hz.his.dto.user; import lombok.Data; /** * 用户查询参数 * @author wzh */ @Data public class UserUnionDto { /** * 小程序appId/公众号appId/其他平台标识 */ private String fromCode; /** * 来源名称 */ private String fromName; /** * 小程序appId/公众号appId/其他标识 */ private String fromAppId; /** * 小程序unionId/公众号unionId */ private String unionId; /** * 小程序openId/公众号openId */ private String openId; /** * 来源平台的用户标识 */ private String merId; /** * 来企业微信员工标识 */ private String corpUserId; } phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java
@@ -5,27 +5,95 @@ import lombok.Data; /** * 用户优惠券 * @author fwq * 用户优惠券扩展 * */ */ @Data public class UserCouponDto extends PageDto { /*****************************取消使用*************************/ /**类型0订单1充值*/ private Integer type; /**子订单号*/ private String orderItemNo; /*****************************新增使用******************************/ /**phis优惠券标识*/ private String couponId; /**数量*/ private Integer couponNum; /**领取类型*/ private Integer collectionType; /**phis用户标识*/ private String userId; /**手机号*/ private String tel; /**操作人标识*/ private String operatorId; /**操作人名称*/ private String operatorName; /**操作人类型*/ private Integer operatorType; /**管理员Id*/ private String adminId; /**管理员名*/ private String adminName; /**备注信息*/ private String remarks; /**是否短信通知客户*/ private Integer isSmsSend; /**标志标识类型:crm,订单order,recharge充值*/ private String commonType; /**标志标识(礼包记录标识或者其他标识)*/ private String commonId; /**标志子标识*/ private String commonItemId; /**有效状态:0作废1有效*/ private Integer validState; /**是否使用*/ private Integer isUse; /**标志标识类型:crm,订单order,recharge充值*/ private String commonType; /**标志标识*/ private String commonId; /**标志子标识*/ private String commonItemId; /**订单号*/ private String orderNo; /**子订单号*/ private String orderItemNo; /**用户优惠券标识*/ private String userCouponId; /**领取类型-未知*/ public static Integer C_TYPE_UNKNOW = -1; /**领取类型-用户自领*/ public static Integer C_TYPE_USER = 0; /**领取类型-管理员赠送*/ public static Integer C_TYPE_ADMIN = 1; /**领取类型-员工赠送*/ public static Integer C_TYPE_STAFF = 2; /**领取类型-协商赠送*/ public static Integer C_TYPE_NEGOTIATION = 3; /**领取类型-换货*/ public static Integer C_TYPE_CHANGE = 4; /**领取类型-充值累计赠送*/ public static Integer C_TYPE_RECHARGE_SEND = 5; /**使用类型-未知*/ public static Integer USE_TYPE_UNKNOW = -1; /**使用类型-用户使用*/ public static Integer USE_TYPE_USER = 0; /**使用类型-管理员核销*/ public static Integer USE_TYPE_ADMIN = 1; /**标志标识-订单*/ public static String COMMON_TYPE_ORDER = "order"; /**标志标识-充值*/ public static String COMMON_TYPE_RECHARGE = "recharge"; /**发送短信状态-成功*/ public static Integer NOTE_STARUS_SUCCEED = 1; /**发送短信状态-失败*/ public static Integer NOTE_STARUS_FALL = 0; /**操作人类型-管理员*/ public static Integer OPERATOR_TYPE_ADMIN = 1; /**操作人类型-员工*/ public static Integer OPERATOR_TYPE_EMPLOYEES = 0; /**操作人类型-用户自领*/ public static Integer OPERATOR_TYPE_USER = 2; } phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java
New file @@ -0,0 +1,183 @@ package com.hz.his.dto.user.money; import lombok.Data; import lombok.ToString; /** * 用户资金 * * @author fwq */ @Data @ToString public class UserMoneyDto { /** * 操作人类型 */ private Integer operatorType; /** * 操作人标识 */ private String operatorId; /** * 操作人名称 */ private String operatorName; /** * 操作备注 */ private String remarks; /** * 记录类型 */ private Integer recordType; /** * 开单类型 */ private Integer billingType; /** * 订单标识 */ private String orderId; /** * 订单编号 */ private String orderNo; /** * phis用户标识 */ private String userId; /** * 变化的储值金(正数加,负数减) */ private String storedValueFund; /** * 变化的增值金(正数加,负数减) */ private String valueAddedFund; /** * 变化的积分(正数加,负数减) */ private String integral; /** * 变化的预定金(正数加,负数减) */ private String deposit; /** * 数据签名 */ private String sign; /** * 数据签名编码 */ private String signCode; /**用户资产操作*/ /** * 资金类型 储值金 0 增值金 1 积分 2 预定金 3 */ private Integer fundType; /** * 操作类型 参考文档 recharge */ private String operationReason; /** * 操作金额 */ private String opNumber; /** * 来源渠道 */ private String originChannel; /** * 来源 */ private String originSubject; /*待领取列表id*/ private String id; /*状态是否领取 (0 待领取 1 已领取)*/ private Integer status; /*资金操作类型 默认为增加 增加 1 减少 0*/ private Integer fundOpType; /* 操作类型 是否需要领取 默认 只有增值金 添加需要领取系统处理 0 用户领取 1*/ private Integer opType; /*****************类型信息 注:以下常量以phis的UserMoneyLog常量为主*******************************/ /** * 应用类型-第三方平台 */ public static final int APP_TYPE_API = 0; /** * 应用类型-预约后台 */ public static final int APP_TYPE_ADMIN = 1; /** * 操作人类型-用户 */ public static final int OPERATOR_TYPE_USER = 0; /** * 操作人类型-员工 */ public static final int OPERATOR_TYPE_EMPLOYEE = 1; /** * 操作人类型-管理员 */ public static final int OPERATOR_TYPE_ADMIN = 2; /** * 操作人类型-系统 */ public static final int OPERATOR_TYPE_SYSTEM = 3; /** * 记录类型-系统记录 */ public static final int RECORD_TYPE_SYSTEM = 0; /** * 记录类型-充值记录 */ public static final int RECORD_TYPE_RECHARGE = 1; /** * 记录类型-退款记录 */ public static final int RECORD_TYPE_REFUND = 2; /** * 记录类型-抵扣记录 */ public static final int RECORD_TYPE_DEDUCTION = 3; /** * 记录类型-转赠记录 */ public static final int RECORD_TYPE_TURN = 4; /** * 记录类型-购买记录 */ public static final int RECORD_TYPE_BUY = 5; /** * 记录类型-协商记录 */ public static final int RECORD_TYPE_NEGOTIATION = 6; /** * 记录类型-退货记录 */ public static final int RECORD_TYPE_RETURN = 7; /** * 记录类型-换货记录 */ public static final int RECORD_TYPE_CHANGE = 8; /** * 开单类型-手动调整 */ public static final int BILLING_TYPE_MANUAL = 0; /** * 开单类型-订单调整 */ public static final int BILLING_TYPE_ORDER = 1; } phis-feign/src/main/java/com/hz/his/feign/service/SWxTokenService.java
File was deleted phis-feign/src/main/java/com/hz/his/feign/service/phis/SCardItemService.java
File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/SCardItemService.java @@ -1,4 +1,4 @@ package com.hz.his.feign.service; package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; import com.hz.his.dto.PageDto; phis-feign/src/main/java/com/hz/his/feign/service/phis/SChannelsService.java
File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/SChannelsService.java @@ -1,4 +1,4 @@ package com.hz.his.feign.service; package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; import com.hz.his.dto.PageDto; phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java
File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/SConsumablesService.java @@ -1,4 +1,4 @@ package com.hz.his.feign.service; package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; import com.hz.his.dto.PageDto; phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/SCouponService.java @@ -1,4 +1,4 @@ package com.hz.his.feign.service; package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; phis-feign/src/main/java/com/hz/his/feign/service/phis/SDictionariesService.java
File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/SDictionariesService.java @@ -1,4 +1,4 @@ package com.hz.his.feign.service; package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; import com.hz.his.dto.dictionaries.DictionariesDto; phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/SEmployeeService.java @@ -1,4 +1,4 @@ package com.hz.his.feign.service; package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/SFileService.java @@ -1,4 +1,4 @@ package com.hz.his.feign.service; package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; import com.hz.his.dto.file.FileDownDto; phis-feign/src/main/java/com/hz/his/feign/service/phis/SGzhService.java
File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/SGzhService.java @@ -1,4 +1,4 @@ package com.hz.his.feign.service; package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; import com.hz.his.dto.gzh.GzhDto; phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java
File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/SLabelService.java @@ -1,4 +1,4 @@ package com.hz.his.feign.service; package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; import com.hz.his.dto.PageDto; phis-feign/src/main/java/com/hz/his/feign/service/phis/SLimitService.java
File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/SLimitService.java @@ -1,4 +1,4 @@ package com.hz.his.feign.service; package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; import com.hz.his.dto.limit.LimitDto; phis-feign/src/main/java/com/hz/his/feign/service/phis/SMemberLevelService.java
File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/SMemberLevelService.java @@ -1,4 +1,4 @@ package com.hz.his.feign.service; package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderGeneralService.java
File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/SOrderGeneralService.java @@ -1,4 +1,4 @@ package com.hz.his.feign.service; package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; import org.springframework.cloud.openfeign.FeignClient; phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java
File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/SOrderService.java @@ -1,4 +1,4 @@ package com.hz.his.feign.service; package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; import com.hz.his.dto.order.OrderDto; phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderUseProjectService.java
File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/SOrderUseProjectService.java @@ -1,4 +1,4 @@ package com.hz.his.feign.service; package com.hz.his.feign.service.phis; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/SProjectService.java @@ -1,4 +1,4 @@ package com.hz.his.feign.service; package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; import com.hz.his.dto.PageDto; phis-feign/src/main/java/com/hz/his/feign/service/phis/SPromotionService.java
File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/SPromotionService.java @@ -1,4 +1,4 @@ package com.hz.his.feign.service; package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; import com.hz.his.dto.PageDto; phis-feign/src/main/java/com/hz/his/feign/service/phis/SSectionRoomService.java
File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/SSectionRoomService.java @@ -1,4 +1,4 @@ package com.hz.his.feign.service; package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java
File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/SShopService.java @@ -1,4 +1,4 @@ package com.hz.his.feign.service; package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserLabelService.java
File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/SUserLabelService.java @@ -1,4 +1,4 @@ package com.hz.his.feign.service; package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; import org.springframework.cloud.openfeign.FeignClient; phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserLevelService.java
File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/SUserLevelService.java @@ -1,12 +1,4 @@ package com.hz.his.feign.service; /** * @ClassName SUserLevelService * @Description 会员等级 * @Author Wrh * @Date 2022/6/24 10:47 * @Version 1.0 */ package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; import com.hz.his.dto.member.MemberDto; phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/SUserService.java @@ -1,4 +1,4 @@ package com.hz.his.feign.service; package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; import com.hz.his.dto.user.UserAppointmentDto; @@ -195,4 +195,16 @@ @PostMapping(value = "/user/wait/increment/list") Result userWaitIncList(@RequestBody UserWaitIncDto userWaitIncDto); /** * 获取用户颜值规划列表 * */ @PostMapping(value = "/user/appearance/list") Result userAppearanceList(@RequestBody UserDto userDto); /** * 获取用户颜值规划详情 * */ @PostMapping(value = "/user/appearance/info") Result userAppearanceInfo(@RequestParam("appearanceId") String appearanceId); } phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCardItemService.java
New file @@ -0,0 +1,29 @@ package com.hz.his.feign.service.platform; import com.hx.resultTool.Result; import com.hz.his.dto.PageDto; import com.hz.his.dto.card.CardQueryDto; import com.hz.his.dto.project.ProjectQueryDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; /** * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名,path 是请求接口前缀 */ @FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-cardItem") public interface SPhipCardItemService { /** * 开放平台-卡项列表 */ @PostMapping(value = "/card/list") Result cardList(@RequestBody CardQueryDto cardQueryDto); /** * 开放平台-卡项详情 */ @PostMapping(value = "/card/detail") Result cardDetail(@RequestBody CardQueryDto cardQueryDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipConsumableService.java
New file @@ -0,0 +1,37 @@ package com.hz.his.feign.service.platform; import com.hx.resultTool.Result; import com.hz.his.dto.PageDto; import com.hz.his.dto.consumables.GoodsQueryDto; import com.hz.his.dto.user.UserParamDto; import com.hz.his.dto.user.UserUnionDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; /** * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名,path 是请求接口前缀 */ @FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-consumable") public interface SPhipConsumableService { /** * 开放平台-耗材分类列表 */ @PostMapping(value = "/goods/type/list") Result goodsTypeList(@RequestBody PageDto pageDto); /** * 开放平台-耗材列表 */ @PostMapping(value = "/goods/list") Result goodsList(@RequestBody GoodsQueryDto goodsQueryDto); /** * 开放平台-耗材详情 */ @PostMapping(value = "/goods/detail") Result goodsDetail(@RequestBody GoodsQueryDto goodsQueryDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
New file @@ -0,0 +1,35 @@ package com.hz.his.feign.service.platform; import com.hx.resultTool.Result; import com.hz.his.dto.coupon.CouponDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; /** * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名,path 是请求接口前缀 */ @FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-coupon") public interface SPhipCouponService { /** * 开放平台-优惠券列表(含指定) */ @PostMapping(value = "/coupon/list/all") Result getCouponList(@RequestBody CouponDto couponDto); /** * 开放平台-派发优惠券给用户 */ @PostMapping(value = "/coupon/send/coupon") Result sendUserCoupon(@RequestBody CouponDto couponDto); /** * 开放平台-作废优惠券 */ @PostMapping(value = "/coupon/cancel/coupon") Result cancelUserCoupon(@RequestBody CouponDto couponDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
New file @@ -0,0 +1,49 @@ package com.hz.his.feign.service.platform; import com.hx.resultTool.Result; import com.hz.his.dto.user.UserParamDto; import com.hz.his.dto.user.UserUnionDto; import com.hz.his.dto.user.coupon.UserCouponDto; import com.hz.his.dto.user.money.UserMoneyDto; import com.hz.his.dto.user.project.UserProjectDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; /** * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名,path 是请求接口前缀 */ @FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-money") public interface SPhipMoneyService { /** * 开放平台-操作用户资金接口 */ @PostMapping(value = "/user/money/unclaimed/add") Result unclaimedAdd(@RequestBody UserMoneyDto userMoneyDto); /** * 开放平台-用户资产领取记录列表 */ @PostMapping(value = "/user/money/unclaimed/receive/list") Result receiveList(@RequestBody UserMoneyDto userMoneyDto); /** * 开放平台-领取用户资产 */ @PostMapping(value = "/user/money/unclaimed/receive") Result receive(@RequestBody UserMoneyDto userMoneyDto); /** * 开放平台-作废用户待领取记录 */ @PostMapping(value = "/user/money/unclaimed/cancel") Result unclaimedCancel(@RequestBody UserMoneyDto userMoneyDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
New file @@ -0,0 +1,46 @@ package com.hz.his.feign.service.platform; import com.hx.resultTool.Result; import com.hz.his.dto.card.CardQueryDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; /** * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名,path 是请求接口前缀 */ @FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-order") public interface SPhipOrderService { /** * 开放平台-新-新增订单更新至phis */ @PostMapping(value = "/newSync/order/add") Result createOrder(@RequestParam("params") String params); /** * 开放平台-新-订单状态更新至phis */ @PostMapping(value = "/newSync/order/orderUpdate") Result updateOrderStatus(@RequestParam("params") String params); /** * 开放平台-新-订单结账更新至phis */ @PostMapping(value = "/newSync/order/pay") Result payOrderSuc(@RequestParam("params") String params); /** * 开放平台-新-订单退款更新至phis */ @PostMapping(value = "/newSync/order/refund") Result refundOrder(@RequestParam("params") String params); /** * 开放平台-新-取消订单更新至phis */ @PostMapping(value = "/newSync/order/cancel") Result cancelOrder(@RequestParam("params") String params); } phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipProjectService.java
New file @@ -0,0 +1,36 @@ package com.hz.his.feign.service.platform; import com.hx.resultTool.Result; import com.hz.his.dto.PageDto; import com.hz.his.dto.consumables.GoodsQueryDto; import com.hz.his.dto.project.ProjectQueryDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; /** * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名,path 是请求接口前缀 */ @FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-project") public interface SPhipProjectService { /** * 开放平台-项目分类列表 */ @PostMapping(value = "/project/type/list") Result projectTypeList(@RequestBody PageDto pageDto); /** * 开放平台-项目列表 */ @PostMapping(value = "/project/list") Result projectList(@RequestBody ProjectQueryDto projectQueryDto); /** * 开放平台-项目详情 */ @PostMapping(value = "/project/detail") Result projectDetail(@RequestBody ProjectQueryDto projectQueryDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipPromotionService.java
New file @@ -0,0 +1,28 @@ package com.hz.his.feign.service.platform; import com.hx.resultTool.Result; import com.hz.his.dto.card.CardQueryDto; import com.hz.his.dto.promotion.PromotionQueryDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; /** * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名,path 是请求接口前缀 */ @FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-promotion") public interface SPhipPromotionService { /** * 开放平台-促销列表 */ @PostMapping(value = "/promotion/list") Result promotionList(@RequestBody PromotionQueryDto promotionQueryDto); /** * 开放平台-促销详情 */ @PostMapping(value = "/promotion/detail") Result promotionDetail(@RequestBody PromotionQueryDto promotionQueryDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java
New file @@ -0,0 +1,28 @@ package com.hz.his.feign.service.platform; import com.hx.resultTool.Result; import com.hz.his.dto.card.CardQueryDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; /** * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名,path 是请求接口前缀 */ @FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-treat") public interface SPhipTreatService { /** * 开放平台-获取通知单详情 */ @PostMapping(value = "/treat/confirmTreatNotice") Result getTreatInfo(@RequestParam("treatSingleId") String treatSingleId); /** * 开放平台-获取通知单确认 */ @PostMapping(value = "/treat/confirmTreatNotice") Result confirmTreat(@RequestParam("treatSingleId") String treatSingleId); } phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
New file @@ -0,0 +1,53 @@ package com.hz.his.feign.service.platform; import com.hx.resultTool.Result; import com.hz.his.dto.token.GetTokenDto; import com.hz.his.dto.user.UserParamDto; import com.hz.his.dto.user.UserUnionDto; import com.hz.his.dto.user.coupon.UserCouponDto; import com.hz.his.dto.user.project.UserProjectDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; /** * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名,path 是请求接口前缀 */ @FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-user") public interface SPhipUserService { /** * 开放平台-用户新增 */ @PostMapping(value = "/user/add") Result addUser(@RequestBody UserParamDto userParamDto); /** * 开放平台-修改用户 */ @PostMapping(value = "/user/edit") Result editUser(@RequestBody UserParamDto userParamDto); /** * 开放平台-新增/修改来源 */ @PostMapping(value = "/user/unionId/edit") Result editUnionUser(@RequestBody UserUnionDto userUnionDto); /** * 开放平台-根据子订单号取消用户项目 */ @PostMapping(value = "/user/project/cancel") Result cancelUserProject(@RequestBody UserProjectDto userProjectDto); /** * 开放平台-根据子订单号取消用户优惠券 */ @PostMapping(value = "/user/coupon/cancel") Result cancelUserCoupon(@RequestBody UserCouponDto userCouponDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/SWxTokenService.java
New file @@ -0,0 +1,54 @@ package com.hz.his.feign.service.platform; import com.hx.resultTool.Result; import com.hz.his.dto.token.GetTokenDto; 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.RequestHeader; /** * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名,path 是请求接口前缀 * url :指定地址(token统一拿线上,所以需要指定) */ @FeignClient(name="phi-platform-service",url = "https://phiapi.phiskin.com",path = "/phip",contextId = "phip-token") public interface SWxTokenService { /** *获取小程序企业微信应用token * 转化使用 WxTokenDt * @param getTokenDto 对象 * @return */ @PostMapping(value = "/account_token/apply/get_token") Result corpApplyToken(@RequestBody GetTokenDto getTokenDto, @RequestHeader(name = "appId",required = true) String appId, @RequestHeader(name = "sign",required = true) String sign, @RequestHeader(name = "appIdCode",required = false) String appIdCode); /** *获取小程序普通token * 转化使用 WxTokenDt * @param getTokenDto 对象 * @return */ @PostMapping(value = "/account_token/mp/get_token") Result mpToken(@RequestBody GetTokenDto getTokenDto, @RequestHeader(name = "appId",required = true) String appId, @RequestHeader(name = "sign",required = true) String sign, @RequestHeader(name = "appIdCode",required = false) String appIdCode); /** *获取公众号普通token * 转化使用 WxTokenDt * @param getTokenDto 对象 * @return */ @PostMapping(value = "/account_token/weChat/get_token") Result weChatToken(@RequestBody GetTokenDto getTokenDto, @RequestHeader(name = "appId",required = true) String appId, @RequestHeader(name = "sign",required = true) String sign, @RequestHeader(name = "appIdCode",required = false) String appIdCode); }