phis-download-feign/src/main/java/com/hz/his/dto/DConsumablesDto.java
@@ -9,6 +9,5 @@ **/ @Data public class DConsumablesDto extends DCommonDto { private Integer type; } phis-download-feign/src/main/java/com/hz/his/feign/download/DFileDownloadService.java
@@ -15,9 +15,11 @@ public interface DFileDownloadService { /**导出类型-底表-预约数据*/ @PostMapping(value = "/report/export/app/list") Result exportAppointmentList(@RequestBody DAppointDto dAppointDto); /**导出类型-底表-医生排班*/ @PostMapping(value = "/report/export/doctor/time/monthData") Result exportDoctorTime(@RequestBody DDoctorTimeDto dDoctorTimeDto); /**导出类型-底表-优惠券*/ @PostMapping(value = "/report/export/coupon/list") Result exportCoupon(@RequestBody DCouponDto dCouponDto); phis-feign/src/main/java/com/hz/his/dto/base/CodeNoDataDto.java
New file @@ -0,0 +1,14 @@ package com.hz.his.dto.base; import lombok.Data; /** * @USER: fhx * @DATE: 2023/10/11 **/ @Data public class CodeNoDataDto { /** 编号 */ private String codeNo; } phis-feign/src/main/java/com/hz/his/dto/consumables/ConsumablesDto.java
@@ -11,4 +11,6 @@ public class ConsumablesDto extends PageDto { /**更新时间*/ private String editTime; /** 购买数量 */ private Integer buyNum; } phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java
@@ -54,6 +54,8 @@ private String marketActivityId; /** 营销活动关联优惠券id */ private String activityCouponId; /** 营销活动分组id */ private String groupId; /** 平台类型(PlatformConstants) */ private String platformType; phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java
@@ -42,6 +42,8 @@ /**是否查询积分订单*/ private Integer isIntegral; //是否查询已完成订单 /**是否查询已完成订单*/ private Integer isSuc; /**是否查询拼团 0 否 1 是*/ private Integer isGroupBuy; } phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
@@ -46,6 +46,8 @@ private BigDecimal totalIntegral; /** 选择退款总金额（额外数据）,parameterVerification方法校验的时候赋值 */ private BigDecimal refundTotal; /** 选择退款总金额（额外数据）,parameterVerification方法校验的时候赋值 */ private BigDecimal refundIntegral; /** 可退款方式集合 */ private List<OrderPayMethodDto> payMethodList; /** 可退款优惠券信息集合 */ phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
@@ -101,4 +101,6 @@ private String treatSingleId; /** 创建方式（OrderTotalConstants） */ private String addWay; /**是否拼团 0 否 1 是*/ private Integer isGroupBuy; } phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
@@ -22,6 +22,10 @@ private List<String> employeeIdList; /**门店标识集合*/ private List<String> shopIdList; /**用户状态*/ List<String> userStatusList; /**是否查询VIP用户*/ Integer selectVip; /**当前时间*/ private String nowTime; /**开始时间*/ phis-feign/src/main/java/com/hz/his/dto/report/ShopIndicatorsDto.java
New file @@ -0,0 +1,29 @@ package com.hz.his.dto.report; import java.util.List; /*** * 门店-咨询师 指标数据 dto */ public class ShopIndicatorsDto { //参数 private List<String> shopIdList; private List<String> timeList; public List<String> getShopIdList() { return shopIdList; } public void setShopIdList(List<String> shopIdList) { this.shopIdList = shopIdList; } public List<String> getTimeList() { return timeList; } public void setTimeList(List<String> timeList) { this.timeList = timeList; } } phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -43,5 +43,7 @@ private Date startTime; /**结束时间*/ private Date endTime; //是否评价 private Integer isEvaluate; } phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
@@ -166,6 +166,9 @@ private String mainAppeal; private String minorAppeal; /**是否处理可是*/ private Integer isEditFamiliesRoom = 0; public UserParamDto() { }
@@ -16,7 +16,7 @@ private String fromCode; /** * 来源名称 * 来源名称/来源路径 */ private String fromName;
@@ -27,4 +27,7 @@ private String recordId; /**操作类型*/ private Integer opType; //是否过滤领建数据 private Integer isFilterate; } phis-feign/src/main/java/com/hz/his/dto/user/money/UserIntegralDto.java
@@ -27,4 +27,6 @@ private String recordId; /**操作类型*/ private Integer opType; //是否过滤领建数据 private Integer isFilterate; } phis-feign/src/main/java/com/hz/his/dto/warehouse/PhiStockMoveDto.java
New file @@ -0,0 +1,51 @@ package com.hz.his.dto.warehouse; import lombok.Data; import java.util.List; /** * 移库单参数 */ @Data public class PhiStockMoveDto { /**来源类型:0为治疗通知单领药*/ private Integer commonType; /**来源标识*/ private String commonId; /**来源编号*/ private String commonNo; /**关联移库单标识*/ private String moveId; /**关联移库单单号*/ private String moveNo; /**操作人类型(具体看如下常量)-必填*/ private Integer opType; /**操作人标识*/ private String opId; /**操作人名称*/ private String opName; /**操作人门店标识*/ private String opShopId; /**操作人门店名称*/ private String opShopName; /**操作人备注*/ private String opRemark; /**移库商品-必填*/ List<PhiStockMoveItemDto> itemDtoList; /**操作人类型-系统*/ public static Integer OP_TYPE_SYS = 0; /**操作人类型-员工*/ public static Integer OP_TYPE_EMPLOYEE = 1; /**操作人类型-用户*/ public static Integer OP_TYPE_USER = 2; /**操作人类型-管理员*/ public static Integer OP_TYPE_ADMIN = 3; } phis-feign/src/main/java/com/hz/his/dto/warehouse/PhiStockMoveItemDto.java
New file @@ -0,0 +1,21 @@ package com.hz.his.dto.warehouse; import lombok.Data; /** * 移库单子项 */ @Data public class PhiStockMoveItemDto { /************************必填******************************/ /**移动库存标识*/ private String sourceItemId; /**移动数量*/ private Integer num; /**目标仓库标识*/ private String targetWarehouseId; } phis-feign/src/main/java/com/hz/his/feign/service/phis/SCodeNoDataService.java
New file @@ -0,0 +1,24 @@ package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; import com.hz.his.dto.PageDto; import com.hz.his.dto.base.CodeNoDataDto; import com.hz.his.dto.card.CardDto; 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="phis-provider",path = "/p-his-data",contextId = "code-no-data") public interface SCodeNoDataService { /** * 查询编号关联数据 * @return Result */ @PostMapping(value = "/code/no/data/detail") Result getDetail(@RequestBody CodeNoDataDto codeNoDataDto); } phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java
@@ -42,4 +42,8 @@ */ @PostMapping(value = "/consumables/coupon/list") Result getConsumablesCouponList(@RequestBody PageDto pageDto); /** 检查优惠券商品是否可购买 */ @PostMapping(value = "/check/consumables/coupon/isBuy") Result checkConsumablesCouponIsBuy(@RequestBody ConsumablesDto dto); } phis-feign/src/main/java/com/hz/his/feign/service/phis/SQuestionnaireService.java
@@ -11,8 +11,8 @@ import java.math.BigDecimal; /** * @ClassName SActivityController * @Description 活动规则 * @ClassName SQuestionnaireService * @Description 调查问卷推送记录 * @Author Wrh * @Date 2022/8/8 17:36 * @Version 1.0 @@ -29,5 +29,14 @@ Result getSendingRecordsDetail(@RequestBody(required = false) UserDto dto); /** * 获取调查问卷推送记录列表 * @param dto 用户标识 * @return Result */ @PostMapping(value = "/sending/records/list") Result getSendingRecordsList(@RequestBody(required = false) UserDto dto); } phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -344,4 +344,10 @@ @PostMapping(value = "/user/draw/list") Result drawGetUserDt(@RequestBody UserDto userDto); /** * 查询用户科室关系 * */ @PostMapping(value = "/user/room/list") Result userRoomList(@RequestBody UserDto userDto); } phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserVisitService.java
New file @@ -0,0 +1,47 @@ package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; import com.hz.his.dto.user.*; import com.hz.his.dto.user.card.UserCardDto; import com.hz.his.dto.user.card.UserCardUsedDto; import com.hz.his.dto.user.coupon.GoodsUsedCouponDto; import com.hz.his.dto.user.coupon.OrderCanUseCouponDto; import com.hz.his.dto.user.coupon.UserCanUseCouponDto; import com.hz.his.dto.user.coupon.UserCouponDto; import com.hz.his.dto.user.label.UserLabelDto; import com.hz.his.dto.user.money.*; import com.hz.his.dto.user.packages.UserPhisPackageDto; import com.hz.his.dto.user.project.UserProjectDto; import com.hz.his.dto.user.project.UserProjectUsedDto; import com.hz.his.dto.user.promotion.UserPromotionUsedDto; 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.util.List; /** * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀 */ @FeignClient(name="phis-provider",path = "/p-his-data",contextId = "user-visit") public interface SUserVisitService { /** * 查询用户是否有到访 * */ @PostMapping(value = "/user/check") Result check(@RequestBody UserDto userDto); @PostMapping(value = "/user/query/visitCount") Result queryVisitCount(UserDto userDto); @PostMapping(value = "/user/query/lastVisit") Result queryLastVisit(UserDto userDto); @PostMapping(value = "/user/query/appointment/list") Result queryAppointmentList(UserDto userDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeService.java
@@ -1,6 +1,7 @@ package com.hz.his.feign.service.platform; import com.hx.resultTool.Result; import com.hz.his.dto.employee.EmployeeDto; import com.hz.his.dto.employee.EmployeeRoleDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -18,4 +19,15 @@ @PostMapping(value = "/employee/role/list") Result getEmployeeRoleList(@RequestBody EmployeeRoleDto employeeRoleDto); /** * 开放平台-生成员工获客链接 */ @PostMapping(value = "/employee/create/acquisition/link") Result createAcquisitionLink(@RequestBody EmployeeDto employeeDto); /** * 开放平台-查询员工获客链接(那些企业用户添加了) */ @PostMapping(value = "/employee/search/acquisition/link") Result searchAcquisitionLink(@RequestBody EmployeeDto employeeDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java
@@ -18,10 +18,22 @@ @PostMapping(value = "/market/activity/list") Result list(@RequestBody MarketActivityDto dto); /** 分类tab列表 */ @PostMapping(value = "/market/activity/tabData") Result tabData(@RequestBody MarketActivityDto dto); /** 顶部轮播图数据 */ @PostMapping(value = "/market/activity/topBannerData") Result topBannerData(@RequestBody MarketActivityDto dto); /** 详情 */ @PostMapping(value = "/market/activity/detail") Result detail(@RequestBody MarketActivityDto dto); /** 确认查看 */ @PostMapping(value = "/market/activity/confirmView") Result confirmView(@RequestBody MarketActivityDto dto); /** 领取优惠券 */ @PostMapping(value = "/market/activity/receiveCoupon") Result receiveCoupon(@RequestBody MarketActivityDto dto); phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -108,4 +108,22 @@ */ @PostMapping(value = "/user/gzh/info") Result userGZHInfo(@RequestBody UserParamDto userParamDto); /** * 开放平台-获取crm小程序跳转链接 */ @PostMapping(value = "/user/crm/url/link") Result getCRMUrlLink(@RequestBody UserUnionDto userParamDto); /** * 开放平台-发送获客消息添加客户 */ @PostMapping(value = "/user/acquisition/sent") Result sentUserAcquisitionSMS(@RequestBody UserParamDto userParamDto); /** * 开放平台-获取用户获客数据记录 */ @PostMapping(value = "/user/acquisition/list") Result getUserAcquisitionList(@RequestBody UserParamDto userParamDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipWareHouseService.java
New file @@ -0,0 +1,21 @@ package com.hz.his.feign.service.platform; import com.hx.resultTool.Result; import com.hz.his.dto.warehouse.PhiStockMoveDto; 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-warehouse") public interface SPhipWareHouseService { /** * 开放平台转发到仓库，生成移库单 */ @PostMapping(value = "/warehouse/order/create/move/stock") Result moveStockOrder(@RequestBody PhiStockMoveDto phiStockMoveDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
@@ -120,5 +120,8 @@ @PostMapping("/admin/consultant/report/first/user/rate/export") Result firstRateListExport(@RequestBody EmployeeReportDto employeeReportDto); /**咨询师-微信聊天总数及群聊数量*/ @PostMapping("/admin/consultant/report/consultant/chat/data") Result consultantWeChatData(@RequestBody EmployeeReportDto employeeReportDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
@@ -52,7 +52,49 @@ @PostMapping("/admin/doctor/sale/report/project/combination/therapy/list") Result combinationTherapy(@RequestBody EmployeeReportDto employeeReportDto); /** * 治疗标签会员数量 */ @PostMapping("/admin/doctor/sale/report/treat/label/info/list") Result treatLabelInfoList(@RequestBody EmployeeReportDto employeeReportDto); /** * 会员治疗情况总表 */ @PostMapping("/admin/doctor/sale/report/treat/detail/list") Result treatDetailList(@RequestBody EmployeeReportDto employeeReportDto); /** * 重点品项数据 */ @PostMapping("/admin/doctor/sale/report/project/items/list") Result projectItemList(@RequestBody EmployeeReportDto employeeReportDto); /** * 分类治疗渗透情况 */ @PostMapping("/admin/doctor/sale/report/type/permeate/list") Result typePermeateList(@RequestBody EmployeeReportDto employeeReportDto); /** * 执行项目-联合多项情况 */ @PostMapping("/admin/doctor/sale/report/project/therapy/multiple") Result projectTypeMultiple(@RequestBody EmployeeReportDto employeeReportDto); /** * 客户预约情况 */ @PostMapping("/admin/doctor/sale/report/appoint/list") Result appointList(@RequestBody EmployeeReportDto employeeReportDto); /*******************************下面接口2.0废弃*********************************/ /** * 执行部位 */ @@ -76,18 +118,6 @@ */ @PostMapping("/admin/doctor/sale/report/loss/project/market/list") Result lossProjectMarketList(@RequestBody EmployeeReportDto employeeReportDto); /** * 治疗标签会员数量 */ @PostMapping("/admin/doctor/sale/report/treat/label/info/list") Result treatLabelInfoList(@RequestBody EmployeeReportDto employeeReportDto); /** * 执行项目-SPU占比 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java
@@ -167,4 +167,10 @@ @PostMapping("/admin/operational/channels/deal/dw/spa") Result channelsSpaDw(@RequestBody OperationalStatementsVo operationalStatementsVo); /** * SPA代王业绩报表-导出 */ @PostMapping("/admin/operational/channels/deal/dw/spa/export") Result channelsSpaDwExport(@RequestBody OperationalStatementsVo operationalStatementsVo); } phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopIndicatorsService.java
New file @@ -0,0 +1,20 @@ package com.hz.his.feign.service.platform.bi; import com.hx.resultTool.Result; import com.hz.his.dto.report.ShopIndicatorsDto; 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 = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-shop-indicators") public interface BiShopIndicatorsService { /*** 咨询师-评分列表 */ @PostMapping("/admin/shop/indicators/list") Result shopEmpDeductionList(@RequestBody(required = false) ShopIndicatorsDto shopIndicatorsDto); }
