phis-feign/src/main/java/com/hz/his/dto/file/FileSignReturnVo.java
New file @@ -0,0 +1,13 @@ package com.hz.his.dto.file; import lombok.Data; /**生成签名访问URL * @author CJH*/ @Data public class FileSignReturnVo { /**文件路径*/ private String fileUrl; } phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java
New file @@ -0,0 +1,15 @@ package com.hz.his.dto.file; import lombok.Data; /**生成签名访问URL * @author CJH*/ @Data public class FileSignVo { /**文件路径*/ private String fileUrl; /**桶名称-可不传*/ private String bucketName; } phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingContentDto.java
New file @@ -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; } phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgDto.java
New file @@ -0,0 +1,20 @@ package com.hz.his.dto.marketing.common; import lombok.Data; import java.util.List; /** * 营销助手发送消息参数 * @author fwq */ @Data public class MarketingMsgDto { /*******************必填项*************************/ /** 是否放大第一个content_item，默认true*/ private Boolean emphasisFirstItem = true; /** 消息内容键值对，最多允许10个item -必填项*/ private List<MarketingMsgItemDto> contentItem; } phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgItemDto.java
New file @@ -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; } phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingReturnDto.java
New file @@ -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; } phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java
New file @@ -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; } phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java
@@ -14,6 +14,10 @@ private Date startTime; /**开单结束时间*/ private Date endTime; /**订单支付开始*/ private Date orderPayStartTime; /**订单支付结束*/ private Date orderPayEndTime; /**订单号*/ private String orderNo; /**所属门店*/ @@ -24,6 +28,14 @@ private Integer deductionStatus; /**项目分类*/ private String typeId; /**品项分类*/ private String goodsClassify; /**月份时间*/ private String monthTime; /**月份时间开始*/ private String startMonthTime; /**月份时间结束*/ private String endMonthTime; /*******保存参数********/ /**操作人标识*/ phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
@@ -95,4 +95,6 @@ public static final String OPERATION_REASON_CHANGE = "changeGoods"; /**操作方式-生日赠送*/ public static final String OPERATION_REASON_BIRTHDAY_GIFT = "birthdayGift"; public static final String OPERATION_REASON_GIFT_0701 = "bringNewUserGift_0701"; } phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java
New file @@ -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); } phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
@@ -2,6 +2,7 @@ import com.hx.resultTool.Result; import com.hz.his.dto.file.FileDownDto; import com.hz.his.dto.file.FileSignVo; import feign.Response; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; @@ -46,4 +47,12 @@ @PostMapping(value = "/cos/download-file") Response downloadFile(@RequestBody FileDownDto cosDownDto); /** *生成签名访问URL * @param fileSignVo 对象 * @return 使用FileSignReturnVo转化 */ @PostMapping(value = "/cos/signUrl") Response downloadFile(@RequestBody FileSignVo fileSignVo); } phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -307,4 +307,16 @@ * */ @PostMapping(value = "/user/check/upgraded/aesthetics") Result checkUpgradedAesthetics(@RequestBody UserDto userDto); /** * 判断用户是否为再升美学会员（是否有购买再升美学卡项订单） * */ @PostMapping(value = "/user/check/consumption") Result checkConsumption(@RequestBody UserDto userDto); /** * 查询用户累计返佣 * */ @PostMapping(value = "/user/rebate/userId") Result queryRebateByUserId(@RequestBody UserDto userDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java
@@ -32,4 +32,15 @@ @PostMapping(value = "/user/money/info") Result userMoneyInfo(@RequestBody UserMoneyDto userMoneyDto); /** * 开放平台-用户资金来源信息(日志消息查询) */ @PostMapping(value = "/user/money/log/source/info") Result userMoneyLogSourceInfo(@RequestBody UserMoneyDto userMoneyDto); /** * 开放平台-用户资金使用信息(日志消息查询) */ @PostMapping(value = "/user/money/log/use/info") Result userMoneyLogUseInfo(@RequestBody UserMoneyDto userMoneyDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -96,4 +96,10 @@ */ @PostMapping(value = "/user/families/room/info/update") Result updateUserFamiliesRoomInfo(@RequestBody UserParamDto userParamDto); /** * 开放平台-用户等级重新计算 */ @PostMapping(value = "/user/level/calc") Result userLevelCalc(@RequestBody UserParamDto userParamDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
@@ -94,5 +94,10 @@ @PostMapping("/admin/consultant/report/user/doctor/deduction/list") Result userDoctorDeductionList(@RequestBody EmployeeReportDto employeeReportDto); /** * 咨询师-医生执行占比数据列表-月统计 */ @PostMapping("/admin/consultant/report/user/doctor/deduction/list/month") Result userDoctorDeductionMonthList(@RequestBody EmployeeReportDto employeeReportDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java
@@ -21,5 +21,10 @@ @PostMapping("/deduction/surface/list") Result surfaceList(@RequestBody DeductionSurfaceDto deductionSurfaceDto); /** * 未执行明细快照列表 */ @PostMapping("/deduction/surface/list/data") Result surfaceListData(@RequestBody DeductionSurfaceDto deductionSurfaceDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
@@ -83,4 +83,10 @@ @PostMapping("/admin/export/shop/user/doctor/deduction/list") Result userDoctorDeductionList(@RequestBody ShopReportDto shopReportDto); /** * 门店-医生执行占比情况-月统计 */ @PostMapping("/admin/export/shop/user/doctor/deduction/list/month") Result userDoctorDeductionMonthList(@RequestBody ShopReportDto shopReportDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java
@@ -34,5 +34,11 @@ @PostMapping(value = "/exp/deduction/surface") Result deductionSurface(@RequestBody DeductionSurfaceDto deductionSurfaceDto); /** * 导出划扣快照报表 * 转换无 */ @PostMapping(value = "/exp/deduction/surface/data") Result deductionSurfaceData(@RequestBody DeductionSurfaceDto deductionSurfaceDto); }
