phis-feign/src/main/java/com/hz/his/dto/project/ProjectWarnRecordDto.java
New file @@ -0,0 +1,37 @@ package com.hz.his.dto.project; import lombok.Data; import java.util.Date; @Data public class ProjectWarnRecordDto { // 页 private Integer pageNum; // 每页数量 private Integer pageSize; // 顾问id private String employeeId; // 用户id private String userId; // 公共标识 private String commonId; // 公共名称 private String commonName; // 上级公共标识 private String parentCommonId; // 上级公共名称 private String parentCommonName; // 风险流失等级 private String lossDevel; // 开始日期 private Date startTime; // 结束日期 private Date endTime; // 关键词查询 CIQ 会员名称 手机号 private String keyWord; public ProjectWarnRecordDto() { } } phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
New file @@ -0,0 +1,41 @@ package com.hz.his.dto.report; import lombok.Data; import java.util.Date; /** * 划扣 **/ @Data public class CashierSettlementDto extends BaseQueryVo{ /**是否单页返回*/ private Integer selectReturn = 0; /**开单开始时间*/ private Date startTime; /**开单结束时间*/ private Date endTime; /**用户等级*/ private String userMemberName; /**订单号*/ private String orderNo; /**是否是初诊单*/ private Integer isBothTheOne; /**推荐名称*/ private String userInviteeName; /**所属咨询师*/ private String userCorpUserName; /**商品名称*/ private String goodsName; /**订单所属门店*/ private String shopId; /**客户所属门店*/ private String userShopId; /*******保存参数********/ /**操作人标识*/ private String operatorId; /**操作人*/ private String operatorName; } phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java
New file @@ -0,0 +1,33 @@ package com.hz.his.dto.report; import lombok.Data; import java.util.Date; /** * 划扣 **/ @Data public class DeductionSurfaceDto extends BaseQueryVo{ /**开单开始时间*/ private Date startTime; /**开单结束时间*/ private Date endTime; /**订单号*/ private String orderNo; /**所属门店*/ private String shopId; /**所属咨询师*/ private String hisCorpName; /**状态:0取消1过期2无效3划扣完成4未划扣5划扣中*/ private Integer deductionStatus; /**项目分类*/ private String typeId; /*******保存参数********/ /**操作人标识*/ private String operatorId; /**操作人*/ private String operatorName; } phis-feign/src/main/java/com/hz/his/dto/user/UserAttentionProductDto.java
New file @@ -0,0 +1,27 @@ package com.hz.his.dto.user; import lombok.Data; /** * 用户关注项目记录 */ @Data public class UserAttentionProductDto { /**用户Id*/ private String userId; /**公共类型(OrderItemConstants)*/ private String commonType; /**公共标识*/ private String commonId; /**公共名称*/ private String commonName; /**请求参数*/ private String pageRoute; /**请求参数*/ private String requestParameter; public UserAttentionProductDto() { } } phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -26,9 +26,11 @@ /**所属顾问名称*/ private String beCorpUser; /**是否查询所属顾问信息:0否1是*/ private Integer isSelectCorp; private Integer isSelectCorp = 0; /**是否查询所属门店信息:0否1是*/ private Integer isSelectShop; private Integer isSelectShop = 0; /**是否查询推荐人信息:0否1是*/ private Integer isSelectInvitee = 0; /**是否有门店*/ private Integer isHaveShop; /**是否有顾问*/ phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipProjectService.java
@@ -2,8 +2,8 @@ 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 com.hz.his.dto.project.ProjectWarnRecordDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -33,4 +33,9 @@ @PostMapping(value = "/project/detail") Result projectDetail(@RequestBody ProjectQueryDto projectQueryDto); /** * 开放平台-项目预警记录列表 */ @PostMapping(value = "/project/warn/record/list") Result projectWarnRecordList(@RequestBody ProjectWarnRecordDto projectWarnRecordDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java
@@ -2,6 +2,7 @@ import com.hx.resultTool.Result; import com.hz.his.dto.user.money.PhisUserMoneyDto; import com.hz.his.dto.user.money.UserMoneyDto; import com.hz.his.dto.user.money.UserMoneyUpdateDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -25,4 +26,10 @@ @PostMapping(value = "/user/money/unclaimed/add") Result userMoneyUpdate(@RequestBody UserMoneyUpdateDto userMoneyUpdateDto); /** * 开放平台-用户资金信息 */ @PostMapping(value = "/user/money/info") Result userMoneyInfo(@RequestBody UserMoneyDto userMoneyDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -1,10 +1,7 @@ package com.hz.his.feign.service.platform; import com.hx.resultTool.Result; import com.hz.his.dto.user.UserInviteeInfoDto; import com.hz.his.dto.user.UserListDto; import com.hz.his.dto.user.UserParamDto; import com.hz.his.dto.user.UserUnionDto; import com.hz.his.dto.user.*; import com.hz.his.dto.user.coupon.UserCouponDto; import com.hz.his.dto.user.project.UserProjectDto; import net.sf.json.JSONObject; @@ -81,4 +78,10 @@ */ @PostMapping("user/invitee/info") Result userInviteeInfo(@RequestBody UserInviteeInfoDto userInviteeInfoDto); /** * 用户关注产品记录 */ @PostMapping("/attention/product/record/edit") Result userAttentionProductRecordEdit(@RequestBody UserAttentionProductDto userAttentionProductDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCashierSettlementService.java
New file @@ -0,0 +1,25 @@ package com.hz.his.feign.service.platform.bi; import com.hx.resultTool.Result; import com.hz.his.dto.report.CashierSettlementDto; import com.hz.his.dto.report.DeductionSurfaceDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; /** * 出纳结算 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀 */ @FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-cashier-settlement") public interface BiCashierSettlementService { /** * 出纳结算列表 */ @PostMapping("/cashier/settlement/common/list") Result cashierSettlementList(@RequestBody CashierSettlementDto cashierSettlementDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java
New file @@ -0,0 +1,25 @@ package com.hz.his.feign.service.platform.bi; import com.hx.resultTool.Result; import com.hz.his.dto.report.ClinicPerfReqDto; import com.hz.his.dto.report.DeductionSurfaceDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; /** * 划扣 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀 */ @FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-deduction-surface") public interface BiDeductionService { /** * 未执行明细列表 */ @PostMapping("/deduction/surface/list") Result surfaceList(@RequestBody DeductionSurfaceDto deductionSurfaceDto); } phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundCancelVo.java
New file @@ -0,0 +1,21 @@ package com.hz.his.vo.order.refund; import lombok.Data; /** * 作废退款实体结构 * @author CJH */ @Data public class RefundCancelVo { /**退款单标识-必填*/ private String id; /**作废备注-必填*/ private String remarks; /**操作员工-必填*/ private String staffId; /**操作员工角色-必填*/ private String staffRoleId; }
