wangrenhuang
2023-04-17 baf3e35721a6d6154e6bed809240c26c5c3b27dc
Merge branch 'master' into master-test
12个文件已添加
1个文件已修改
626 ■■■■■ 已修改文件
phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashDto.java 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashReportDto.java 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantCashService.java 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java 85 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/phis/dt/reward/AnswerDto.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/phis/dt/reward/QuestionInvestigateDto.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashDto.java
New file
@@ -0,0 +1,82 @@
package com.hz.his.dto.report;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class ConsultantCashDto{
    private String userId;
    private String userName;
    private String tel;
    private String CIQ;
    private String memberNO;
    private String userType;
    private String channelId;
    private String channelName;
    private String channel2Id;
    private String channelName2;
    private String channelCategory;
    private String arrivalType;
    private String orderNo;
    private String type;
    private String orderId;
    private String developerShopId;
    private String developerShopName;
    private String cashierShopId;
    private String cashierShopName;
    private String serviceShopId;
    private String serviceShopName;
    private String operatorId;
    private String operatorName;
    private Date orderTime;
    private String orderConsultantId;
    private String orderConsultantName;
    private String cashierId;
    private String cashierName;
    private String developerId;
    private String developerName;
    private String goodsType;
    private String itemTypeId1;
    private String itemTypeName1;
    private String itemTypeId2;
    private String itemTypeName2;
    private String itemTypeId3;
    private String itemTypeName3;
    private String goodsName;
    private BigDecimal discount;
    private String doctorQualification;
    private String specification;
    private String unit;
    private String specs = "[]";
    private BigDecimal proPrice=BigDecimal.ZERO;
    private Integer buyNum;
    private String transactionType;
    private String payMode;
    private Date payTime;
    private String remarks;
    private BigDecimal performanceMoney=BigDecimal.ZERO;
    //用户咨询师(荣爷说权限按照这个查询)
    private String hisCorpUserName;
    //交易类型
    public static final String TYPE_TRANSACTION_PROCEEDS="收款";
}
phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashReportDto.java
New file
@@ -0,0 +1,55 @@
package com.hz.his.dto.report;
import com.hz.his.dto.PageDto;
import lombok.Data;
/**
 * 咨询师现金业绩报表
 *
 * @Author: zhouxiang
 * @Date: 2022/12/22/10:35
 * @Description:
 */
@Data
public class ConsultantCashReportDto extends PageDto {
    //开单时间:开始时间(格式:yyyy-MM-dd)
    private String startTime;
    //开单时间:结束时间(格式:yyyy-MM-dd)
    private String endTime;
    //门店标识
    private String shopId;
    //收银门店
    private String cashierShopId;
    //关键字查询
    private String keyWord;
    //业务分类('收款','退款')
    private String transactionType;
    //营销分类(商品分类,OrderItemConstants)
    private String goodsType;
    //订单类型(OrderTotalConstants)
    private String type;
    //订单号
    private String orderNo;
    //渠道,末级id
    private String channel2Id;
    //客户(姓名、ciq、会员号、手机号)
    private String userName;
    //客户类别
    private String userType;
    //项目分类,末级id
    private String itemTypeId;
    //商品名称
    private String goodsName;
    //开单咨询师(荣爷说权限按照这个查询)
    private String orderConsultantId;
    //开单咨询师(荣爷说权限按照这个查询)
    private String orderConsultantName;
    //开单咨询师(荣爷说权限按照这个查询)
    private ConsultantCashDto consultantCashReport;
    //用户咨询师(荣爷说权限按照这个查询)
    private String hisCorpUserName;
    //用户咨询师(荣爷说权限按照这个查询)
    private String hisCorpUserId;
    //登录员工标识
    private String loginEmpId;
}
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
New file
@@ -0,0 +1,29 @@
package com.hz.his.dto.report;
import lombok.Data;
import java.util.List;
/**
 * 咨询师报表扩展
 * @author fwq
 * */
@Data
public class EmployeeReportDto {
    /**员工标识*/
    private String employeeId;
    /**门店标识*/
    private String shopId;
    /**登录员工唯一字符串*/
    private String roleStr;
    /**员工标识集合*/
    private List<String> employeeIdList;
    /**门店标识集合*/
    private List<String> shopIdList;
    /**当前时间*/
    private String nowTime;
    /**开始时间*/
    private String startTime;
    /**结束时间*/
    private String endTime;
}
phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java
New file
@@ -0,0 +1,23 @@
package com.hz.his.dto.report;
import lombok.Data;
import java.util.List;
/**
 * 门店报表扩展
 * @author fwq
 * */
@Data
public class ShopReportDto {
    /**门店标识*/
    private String shopId;
    /**当前时间*/
    private String nowTime;
    /**开始时间*/
    private String startTime;
    /**结束时间*/
    private String endTime;
    /**门店列表标识*/
    private List<String> shopIdList;
}
phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java
New file
@@ -0,0 +1,25 @@
package com.hz.his.dto.report;
import com.hz.his.dto.PageDto;
import lombok.Data;
import java.util.List;
/**
 * 咨询师报表扩展
 * @author fwq
 * */
@Data
public class UserReleaseDto extends PageDto {
    /**员工标识*/
    private String employeeId;
    /**当前时间*/
    private String nowTime;
    /**顶部咨询师列表*/
    private List<String> topEmployeeIdList;
    /**咨询师列表*/
    private List<String> employeeIdList;
    /**等级列表*/
    private List<String> memberLevelList;
}
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantCashService.java
New file
@@ -0,0 +1,36 @@
package com.hz.his.feign.service.platform.bi;
import com.hx.resultTool.Result;
import com.hz.his.dto.report.ConsultantCashReportDto;
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-consultant-cash")
public interface BiConsultantCashService {
    /**
     * 新,通过sql查询
     *
     * @param dto
     * @return
     */
    @PostMapping("/report/consultant/cash/list")
    Result newList(@RequestBody ConsultantCashReportDto dto);
    /**
     * 新,查看咨询师现金业绩汇总报表管理
     *
     * @param dto
     * @return
     */
    @PostMapping("/report/consultant/cash/total/list")
    Result totalList(@RequestBody ConsultantCashReportDto dto);
}
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java
New file
@@ -0,0 +1,85 @@
package com.hz.his.feign.service.platform.bi;
import com.hx.resultTool.Result;
import com.hz.his.dto.report.EmployeeReportDto;
import com.hz.his.dto.report.UserReleaseDto;
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-consultant-day")
public interface BiConsultantDayService {
    /**
     * 咨询师-各业绩指标数据
     * EmployeeAchievementVo
     */
    @PostMapping("/admin/export/employee/indicators/list")
    Result indicators(@RequestBody EmployeeReportDto employeeReportDto);
    /**
     * 咨询师-初诊情况
     *  EmployeeFirstTreatVo
     */
    @PostMapping("/admin/export/employee/first/treat/list")
    Result firstTreat(@RequestBody EmployeeReportDto employeeReportDto);
    /**
     * 咨询师-到访未成交名单
     *
     */
    @PostMapping("/admin/export/employee/first/treat/user/list")
    Result firstTreatUser(@RequestBody EmployeeReportDto employeeReportDto);
    /**
     * 咨询师-核心项目指标数据
     */
    @PostMapping("/admin/export/employee/core/project/list")
    Result coreProject(@RequestBody EmployeeReportDto employeeReportDto);
    /**
     * 咨询师-公海释放名单
     */
    @PostMapping("/admin/export/employee/user/release/list")
    Result userReleaseList(@RequestBody UserReleaseDto userReleaseDto);
    /**
     * 咨询师-流失客户列表
     */
    @PostMapping("/admin/export/employee/user/lose/list")
    Result userLoseList(@RequestBody UserReleaseDto userReleaseDto);
    /**
     * 咨询师-沉睡客户列表
     */
    @PostMapping("/admin/export/employee/user/sleep/list")
    Result userSleepList(@RequestBody UserReleaseDto userReleaseDto);
    /**
     * 咨询师-沉睡客户比例
     */
    @PostMapping("/admin/export/employee/user/sleep/proportion")
    Result userSleepProportion(@RequestBody UserReleaseDto userReleaseDto);
    /**
     * 咨询师-会员等级分布列表
     */
    @PostMapping("/admin/export/employee/user/member/distribution")
    Result memberDistribution(@RequestBody UserReleaseDto userReleaseDto);
    /**
     * 咨询师-会员等级分比例
     */
    @PostMapping("/admin/export/employee/user/member/distribution/proportion")
    Result memberDistributionProportion(@RequestBody UserReleaseDto userReleaseDto);
}
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
New file
@@ -0,0 +1,86 @@
package com.hz.his.feign.service.platform.bi;
import com.hx.resultTool.Result;
import com.hz.his.dto.report.EmployeeReportDto;
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-consultant-sale")
public interface BiConsultantSaleService {
    /**
     * 咨询师-业绩总列表
     */
    @PostMapping("/admin/consultant/report/deduction/total/list")
    Result deductionList(@RequestBody(required = false) EmployeeReportDto employeeReportDto);
    /**
     * 咨询师-执行业绩快报
     */
    @PostMapping("/admin/consultant/report/deduction/detail/list")
    Result deductionDetailList(@RequestBody EmployeeReportDto employeeReportDto);
    /**
     * 咨询师-初诊简报
     */
    @PostMapping("/admin/consultant/report/first/treat/list")
    Result firstTreatList(@RequestBody EmployeeReportDto employeeReportDto);
    /**
     * 咨询师-预约到诊
     */
    @PostMapping("/admin/consultant/report/appointment/arrive/list")
    Result  appointmentArriveList(@RequestBody EmployeeReportDto employeeReportDto);
    /**
     * 咨询师-老带新简报
     */
    @PostMapping("/admin/consultant/report/old/new/list")
    Result  oldLeadNew(@RequestBody EmployeeReportDto employeeReportDto);
    /**
     * 咨询师-会员变动数据
     */
    @PostMapping("/admin/consultant/report/level/change/list")
    Result levelChangeList(@RequestBody EmployeeReportDto employeeReportDto);
    /**
     * 咨询师-季度活跃客户
     */
    @PostMapping("/admin/consultant/report/active/user/list")
    Result activeUserList(@RequestBody EmployeeReportDto employeeReportDto);
    /**
     * 咨询师-流失客户
     */
    @PostMapping("/admin/consultant/report/loss/user/list")
    Result lossUserList(@RequestBody EmployeeReportDto employeeReportDto);
    /**
     * 咨询师-核心项目
     */
    @PostMapping("/admin/consultant/report/core/project/list")
    Result coreProjectList(@RequestBody EmployeeReportDto employeeReportDto);
    /**
     * 咨询师-沉睡客执行业绩
     */
    @PostMapping("/admin/consultant/report/user/sleep/deduction/list")
    Result userSleepDeductionList(@RequestBody(required = false) EmployeeReportDto employeeReportDto);
    /**
     * 咨询师-医生执行占比数据列表
     */
    @PostMapping("/admin/consultant/report/user/doctor/deduction/list")
    Result userDoctorDeductionList(@RequestBody EmployeeReportDto employeeReportDto);
}
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java
New file
@@ -0,0 +1,52 @@
package com.hz.his.feign.service.platform.bi;
import com.hx.resultTool.Result;
import com.hz.his.dto.report.ShopReportDto;
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-day")
public interface BiShopDayService {
    /**
     * 日报表-当日到店信息
     * ArriveShopVo
     */
    @PostMapping("/admin/export/shop/day/arriveShop")
    Result arriveShop(@RequestBody ShopReportDto shopReportDto);
    /**
     * 日报表-当日各业绩指标
     * ShopAchievementVo
     */
    @PostMapping("/admin/export/shop/day/indicators")
    Result indicators(@RequestBody ShopReportDto shopReportDto);
    /**
     * 新老会员数据
     * ShopOldLeadNewVo
     */
    @PostMapping("/admin/export/shop/day/old/lead/new")
    Result oldLeadNew(@RequestBody ShopReportDto shopReportDto);
    /**
     * 重点项目指标数据
     * ShopImportantProjectVo
     */
    @PostMapping("/admin/export/shop/important/project/indicators/list")
    Result importantProjectIndicators(@RequestBody ShopReportDto shopReportDto);
    /**
     * 其它业绩信息
     * ShopOtherVo
     */
    @PostMapping("/admin/export/shop/other/list")
    Result otherInAchievement(@RequestBody ShopReportDto shopReportDto);
}
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
New file
@@ -0,0 +1,82 @@
package com.hz.his.feign.service.platform.bi;
import com.hx.resultTool.Result;
import com.hz.his.dto.report.ShopReportDto;
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-sale")
public interface BiShopSaleService {
    /**
     * 门店-业绩总列表
     */
    @PostMapping("/admin/export/shop/deduction/total/list")
    Result deductionList(ShopReportDto shopReportDto);
    /**
     * 门店-执行业绩快报
     */
    @PostMapping("/admin/export/shop/deduction/detail/list")
    Result deductionDetailList(@RequestBody ShopReportDto shopReportDto);
    /**
     * 门店-初诊简报
     */
    @PostMapping("/admin/export/shop/first/treat/list")
    Result firstTreatList(@RequestBody ShopReportDto shopReportDto);
    /**
     * 门店-预约到诊
     */
    @PostMapping("/admin/export/shop/appointment/arrive/list")
    Result appointmentArriveList(@RequestBody ShopReportDto shopReportDto);
    /**
     * 门店-老带新简报
     */
    @PostMapping("/admin/export/shop/old/new/list")
    Result oldLeadNew(@RequestBody ShopReportDto shopReportDto);
    /**
     * 门店-会员变动数据
     */
    @PostMapping("/admin/export/shop/level/change/list")
    Result levelChangeList(@RequestBody ShopReportDto shopReportDto);
    /**
     * 门店-季度活跃客户
     */
    @PostMapping("/admin/export/shop/active/user/list")
    Result activeUserList(@RequestBody ShopReportDto shopReportDto);
    /**
     * 门店-流失客户
     */
    @PostMapping("/admin/export/shop/loss/user/list")
    Result lossUserList(@RequestBody ShopReportDto shopReportDto);
    /**
     * 门店-核心项目
     */
    @PostMapping("/admin/export/shop/core/project/list")
    Result coreProjectList(@RequestBody ShopReportDto shopReportDto);
    /**
     * 门店-沉睡客执行业绩
     */
    @PostMapping("/admin/export/shop/user/sleep/deduction/list")
    Result userSleepDeductionList(@RequestBody ShopReportDto shopReportDto);
}
phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.activity.ActivityDto;
import com.hz.phis.dt.reward.QuestionInvestigateDto;
import com.hz.phis.dt.reward.RewardRecordDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -27,4 +28,18 @@
     */
    @PostMapping(value = "/questionnaire/reward")
    Result reward(RewardRecordDto recordDto);
    /**
     * 调查问卷详情
     */
    @PostMapping(value = "/questionnaire/investigate/details")
    Result details(QuestionInvestigateDto questionInvestigateDto);
    /**
     * 提交调查问卷
     */
    @PostMapping(value = "/questionnaire/submit")
    Result submit(QuestionInvestigateDto questionInvestigateDto);
}
phis-feign/src/main/java/com/hz/phis/dt/reward/AnswerDto.java
New file
@@ -0,0 +1,21 @@
package com.hz.phis.dt.reward;
import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;
/**
 * @ClassName AwardDto
 * @Description 调查问卷提交数据dto
 * @Author wrh
 * @Date 2023/4/17 10:46
 * @Version 1.0
 */
@Data
public class AnswerDto {
    private String code;
    private String titleId;
    private String answer;
}
phis-feign/src/main/java/com/hz/phis/dt/reward/QuestionInvestigateDto.java
New file
@@ -0,0 +1,35 @@
package com.hz.phis.dt.reward;
import com.hz.phis.dt.BaseDt;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
 * @ClassName QuestionInvestigateDto
 * @Description 调查问卷dto
 * @Author wrh
 * @Date 2023/4/17 10:39
 * @Version 1.0
 */
@Data
public class QuestionInvestigateDto extends BaseDt {
    private String code;
    private String investigateId;
    private String userId;
    private Integer type;
    private Date startTime;
    private Date doneTime;
    private String proposal;
    //答案数据
    private List<AnswerDto> answerDtoList;
}