Merge branch 'master' into master-test

fwq

2023-06-26 fc9cac864414b566e3516f6702b716e8ed00e9dc

Merge branch 'master' into master-test

 phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeVo.java

New file
@@ -0,0 +1,75 @@
package com.hz.his.dto.employee;

import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
import com.gitee.sunchenbin.mybatis.actable.annotation.Index;
import com.gitee.sunchenbin.mybatis.actable.annotation.Table;
import com.gitee.sunchenbin.mybatis.actable.annotation.Unique;
import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;

import java.util.List;

/**
 *
 * 员工
 * author:fhx
 * Date:2021/8/4 17:35
 */

@Data
public class EmployeeVo {

    private String id;
    private String unionId;

    private String userId;

    private String cnName;

    private String enName;

    private String tel;

    private String email;

    private String imgUrl;

    private String apiId;

    private Integer isJob;

    private Integer gender ;

    private String employeeNo;

    private String roleId;

    private Integer isSyncRole;
    private String idCard;
    private String birthday;
    private String degree;
    private String certificateNo;
    private String password;
    private Integer isPerformanceEmp;
    private String cardId;

    //sql语句返回使用字段
    private String shopId;
    private String shopName;
    private String shopHisId;
    private String roleName;
    private String roleStr;
    private String roleTypeId;
    private String adminRoleId;
    //登录角色id
    private String loginRoleId;

    // 关联后台管理员id
    private String adminId;
    private String adminName;

    public EmployeeVo() {
    }


}

 phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPayMarketingDto.java

New file
@@ -0,0 +1,23 @@
package com.hz.his.dto.marketing;

import com.hz.his.dto.order.OrdersTotalDto;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
 * 营销助手订单支付申请入参
 * @author fwq
 */
@Data
public class OrderPayMarketingDto extends MarketingDto{
    /*******************必填项(注意继承的公共类MarketingDto)*************************/
    /**订单信息*/
    private OrdersTotalDto ordersTotalDto;
    /**订单折扣(单位:百分比)*/
    private BigDecimal discountNum;
    /**订单项目信息*/
    private List<RefundProjectDto> projectDtoList;

}

 phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java

@@ -17,4 +17,6 @@
    private String projectName;
    /**退的数量 商品/项目/... - 必填*/
    private Integer refundNum;
    /**买的数量 商品/项目/...*/
    private Integer buyNum;
}

 phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java

@@ -40,6 +40,8 @@
    //////系统参数
    /** 可退款总金额（额外数据）,parameterVerification方法校验的时候赋值 */
    private BigDecimal totalAmount;
    /** 可退款总积分（额外数据）,parameterVerification方法校验的时候赋值 */
    private BigDecimal totalIntegral;
    /** 选择退款总金额（额外数据）,parameterVerification方法校验的时候赋值  */
    private BigDecimal refundTotal;
    /** 可退款方式集合 */

 phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java

@@ -32,6 +32,8 @@
    private String shopId;
    /**客户所属门店*/
    private String userShopId;
    /**销售平台*/
    private String sourceName;

    /*******保存参数********/
    /**操作人标识*/

 phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java

@@ -87,4 +87,8 @@
    private Integer sumIsShop = NO;
    //汇总角色
    private String sumRole;

    //操作人
    private String operatorId;
    private String operatorName;
}

 phis-feign/src/main/java/com/hz/his/dto/report/TmkOrderPerfReqDto.java

@@ -22,4 +22,8 @@
    private String chatCorpUserId;
    //前置天数
    private Integer leadDays;

    //操作人
    private String operatorId;
    private String operatorName;
}

 phis-feign/src/main/java/com/hz/his/dto/shop/ShopVo.java

New file
@@ -0,0 +1,60 @@
package com.hz.his.dto.shop;

import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;

/**
 * 门店
 */
@Data
public class ShopVo {

    private String id;
    private String code;

    private String name;

    private String institutionalCode;

    private String departmentId;

    private Integer corpMpDepId;

    private Integer maxAppNum;

    private Integer maxSwitchNum;

    private Integer isUp;

    private String workTime;

    private String province;

    private String city;

    private String area;

    private String addr;

    private String colorStr;

    private String doctorRelaxTime;

    private String carWay;

    private String subWay;

    private String apiId;
    private Integer shengMeiNum;
    private Integer sameTimeCustomerNum;

    private String clinicCode;
    private String clinicName;

    private Integer isPerformanceShop;

    public ShopVo() {
    }

}

 phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java

@@ -1,7 +1,11 @@
package com.hz.his.dto.user;

import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import com.hz.his.dto.PageDto;
import lombok.Data;

import java.util.Date;


/**查询用户详情数据*/
@@ -35,4 +39,9 @@
    private Integer isHaveShop;
    /**是否有顾问*/
    private Integer isHaveCorp;

    private Date startTime;

    private Date endTime;

}

 phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java

@@ -4,6 +4,7 @@
import com.hz.his.dto.marketing.OrderCancelDto;
import com.hz.his.dto.marketing.OrderDiscountDto;
import com.hz.his.dto.marketing.OrderPartRefundDto;
import com.hz.his.dto.marketing.OrderPayMarketingDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -34,4 +35,10 @@
    @PostMapping(value = "/order/apply/part/refund")
    Result applyPartRefund(@RequestBody OrderPartRefundDto orderPartRefundDto);

    /**
     * 订单支付申请
     */
    @PostMapping(value = "/order/apply/order/pay")
    Result orderPay(@RequestBody OrderPayMarketingDto orderPayMarketingDto);

}

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java

@@ -68,4 +68,10 @@
    @PostMapping(value = "/emp/role/info/list")
    Result employeeRoleList(@RequestBody(required = false) EmployeeRoleDto employeeRoleDto);

    @PostMapping(value = "/emp/check/doctor")
    Result checkEmployeeRoleDoctor(@RequestBody(required = false) EmpDocDto employeeDto);

    @PostMapping(value = "/emp/detail/name")
    Result getDetailsByName(@RequestBody(required = false) EmpDocDto employeeDto);

}

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java

@@ -36,4 +36,19 @@
     */
    @PostMapping(value = "/shop/list")
    Result getList(@RequestBody TimeDto timeDto);


    /**
     * 获取门店详情返回vo
     * @return Result
     */
    @PostMapping(value = "/shop/detail/vo")
    Result getShopDetailVo(@RequestBody ShopDto shopDto);

    /**
     * 获取门店详情返回vo
     * @return Result
     */
    @PostMapping(value = "/shop/detail/name")
    Result getDetailByName(@RequestBody ShopDto shopDto);
}

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java

@@ -285,8 +285,20 @@
    Result nextLevel(@RequestBody UserDto userDto);

    /**
     * 查询用户会员等级下一级
     * 查询累计返佣
     * */
    @PostMapping(value = "/user/query/rebate")
    Result queryRebate(@RequestBody UserDto userDto);

    /**
     * 查询用户首天消费累计
     * */
    @PostMapping(value = "/user/first/day/consumption")
    Result firstDayConsumption(@RequestBody UserDto userDto);

    /**
     * 查询用户首天消费累计
     * */
    @PostMapping(value = "/user/accumulat/consumption")
    Result accumulateConsumption(@RequestBody UserDto userDto);
}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java

@@ -106,6 +106,12 @@
    Result marketingAduit(@RequestBody AduitDto dto);

    /**
     * 开放平台-营销助手订单支付审核通过/拒绝接口
     */
    @PostMapping(value = "/audit/marketing/aduit/pay")
    Result marketingAduitPay(@RequestBody AduitDto dto);

    /**
     * 开放平台-营销助手订单取消审核通过/拒绝接口
     */
    @PostMapping(value = "/audit/order/cancel")

 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantPerfService.java

@@ -27,6 +27,17 @@
    Result summaryList(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);


    /**
     * 咨询师业绩导出
     */
    @PostMapping("/admin/consultant/perf/export")
    Result export(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);

    /**
     * 咨询师业绩汇总导出
     */
    @PostMapping("/admin/consultant/perf/summary/export")
    Result sumExport(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);


}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorPerfService.java

@@ -27,6 +27,17 @@
    Result summaryList(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);


    /**
     * 医生业绩导出
     */
    @PostMapping("/admin/doctor/perf/export")
    Result export(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);

    /**
     * 医生业绩汇总导出
     */
    @PostMapping("/admin/doctor/perf/summary/export")
    Result sumExport(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);


}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiNursePerfService.java

@@ -21,12 +21,22 @@
    Result list(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);

    /**
     * 医生执行业绩汇总
     * 护士执行业绩汇总
     */
    @PostMapping("/admin/nurse/perf/summary/list")
    Result summaryList(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);

    /**
     * 护士业绩导出
     */
    @PostMapping("/admin/nurse/perf/export")
    Result export(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);

    /**
     * 护士业绩汇总导出
     */
    @PostMapping("/admin/nurse/perf/summary/export")
    Result sumExport(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);


}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTmkPerfService.java

@@ -16,7 +16,7 @@
public interface BiTmkPerfService {

    /**
     * 订单业绩明细列表
     * 电网业绩明细列表
     */
    @PostMapping("/admin/tmk/perf/orderPerfList")
    Result orderPerfList(@RequestBody TmkOrderPerfReqDto tmkOrderPerfReqDto);
@@ -33,5 +33,17 @@
    @PostMapping("/admin/tmk/perf/summary/sumData")
    Result sumData(@RequestBody TmkOrderPerfReqDto tmkOrderPerfReqDto);

    /**
     * 电网业绩导出
     */
    @PostMapping("/admin/tmk/perf/orderPerfExport")
    Result export(@RequestBody TmkOrderPerfReqDto tmkOrderPerfReqDto);

    /**
     * 电网业绩汇总导出
     */
    @PostMapping("/admin/tmk/perf/summary/export")
    Result sumExport(@RequestBody TmkOrderPerfReqDto tmkOrderPerfReqDto);


}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java

@@ -1,11 +1,8 @@
package com.hz.his.feign.service.platform.bi;

import com.hx.resultTool.Result;
import com.hz.his.dto.file.FileExUpdateDto;
import com.hz.his.dto.file.FileExportDto;
import com.hz.his.vo.bi.exp.CashierSettlementVo;
import com.hz.his.vo.bi.exp.CashierSurfaceVo;
import com.hz.his.vo.bi.exp.DeductionSurfaceVo;
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;
@@ -21,21 +18,21 @@
     * 无转换
     */
    @PostMapping(value = "/exp/cashier/settlement")
    Result cashierSettlement(@RequestBody CashierSettlementVo cashierSettlementVo);
    Result cashierSettlement(@RequestBody CashierSettlementDto cashierSettlementDto);

    /**
     * 导出收银报表
     * 转换无
     */
    @PostMapping(value = "/exp/cashier/surface")
    Result cashierSurface(@RequestBody CashierSurfaceVo cashierSurfaceVo);
    Result cashierSurface(@RequestBody CashierSettlementDto cashierSettlementDto);

    /**
     * 导出划扣报表
     * 转换无
     */
    @PostMapping(value = "/exp/deduction/surface")
    Result deductionSurface(@RequestBody DeductionSurfaceVo deductionSurfaceVo);
    Result deductionSurface(@RequestBody DeductionSurfaceDto deductionSurfaceDto);


}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/refund/SCardRefundService.java

New file
@@ -0,0 +1,30 @@
package com.hz.his.feign.service.platform.refund;

import com.hx.resultTool.Result;
import com.hz.his.vo.order.refund.card.RefundUserCardVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**用户卡项退款feign
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 * @author CJH
 */
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "card-refund")
public interface SCardRefundService {

    /**
     * 开放平台-获取用户卡项条目可退款金额
     * data 实体转化用（RefundUserCardVo）
     */
    @PostMapping(value = "/card/refund/get/amount")
    Result getRefundAmount(@RequestBody RefundUserCardVo refundUserCardVo);

    /**
     * 开放平台-确认提交退款
     * data 无实体转化用
     */
    @PostMapping(value = "/confirm")
    Result refundConfirm(@RequestBody RefundUserCardVo refundUserCardVo);

}

 phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java

New file
@@ -0,0 +1,40 @@
package com.hz.his.vo.order.refund;

import lombok.Data;

import java.math.BigDecimal;

/**
 * @author CJH
 * 退回支付记录扩展
 */
@Data
public class RefundMethodVo {

    /** 可退支付方式标识 */
    private String payMethodId;
    /** 可退支付方式编码 */
    private String payMethodNo;
    /** 可退支付方式名称 */
    private String payMethodName;
    /** 可退支付金额 */
    private BigDecimal payTotal;
    /**是否现金支付 0否1是*/
    private Integer isMoneyPay;
    /**是否划扣计算：0否1是*/
    private Integer isExecute;

    /** 转换方式标识 （实际退款方式标识）*/
    private String refundMethodId;
    /** 转换方式编码 （实际退款方式编码）*/
    private String refundMethodNo;
    /** 转换方式名称 （实际退款方式编码）*/
    private String refundMethodName;
    /** 转换实退金额 （实际退款金额）*/
    private BigDecimal refundTotal;
    /**转换是否现金支付 0否1是*/
    private Integer isMoneyPayRefund;
    /**转换是否划扣计算：0否1是*/
    private Integer isExecuteRefund;

}

 phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java

New file
@@ -0,0 +1,31 @@
package com.hz.his.vo.order.refund.card;

import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**卡项（卡包）退款金额信息计算结构体-权益
 * @author CJH
 * */
@Data
public class RefundUserCardEquityVo {

    /** 用户卡包卡项条目标识 */
    private String cardEquityId;
    /** 用户卡包卡项条目名称 */
    private String cardEquityName;
    /** 退款卡项条目 */
    private List<RefundUserCardItemVo> refundUserCardItemVoList;

    //---用于系统返回参数计算
    /** 可退总金额*/
    private BigDecimal approveRefundTotal = BigDecimal.ZERO;
    /** 可退总积分*/
    private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
    /**分配金额*/
    private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
    /**分配积分*/
    private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;

}

 phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java

New file
@@ -0,0 +1,33 @@
package com.hz.his.vo.order.refund.card;

import lombok.Data;

import java.math.BigDecimal;

/**卡项（卡包）退款金额信息计算结构体-条目
 * @author CJH
 * */
@Data
public class RefundUserCardItemVo {

    /** 用户卡包卡项条目标识 */
    private String cardItemInfoId;
    /** 用户卡包卡项条目名称 */
    private String cardItemInfoName;
    /**退款数量（抵扣次数）*/
    private Integer refundQuantity;
    /**是否最后的抵扣次数*/
    private boolean lastNum = false;

    //---用于系统返回参数计算
    /** 可退总金额*/
    private BigDecimal approveRefundTotal = BigDecimal.ZERO;
    /** 可退总积分*/
    private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
    /**分配金额*/
    private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
    /**分配积分*/
    private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;


}

 phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java

New file
@@ -0,0 +1,66 @@
package com.hz.his.vo.order.refund.card;


import com.hz.his.vo.order.refund.RefundMethodVo;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**卡项（卡包）退款金额信息计算结构体-总信息
 * @author CJH
 */
@Data
public class RefundUserCardVo {

    /** 用户卡包标识 */
    private String userCardId;
    /** 用户卡包名称 */
    private String userCardName;

    /** 卡项权益 */
    private List<RefundUserCardEquityVo> refundUserCardEquityVoList;
    /**支付方式*/
    private List<RefundMethodVo> payMethodVos;
    /**退款支付方式*/
    private List<RefundMethodVo> refundMethodVos;
    /** 退款原因（员工） */
    private String remarks;
    /** 退款原因（用户） */
    private String refundReason;

    /**操作人类型，默认员工*/
    private String  opType = OP_TYPE_STAFF;
    /**操作员工标识*/
    private String staffId;
    /**操作员工角色标识*/
    private String staffRoleId;
    /**操作平台-标志*/
    private String appId;
    /**操作平台-商户自定义编码*/
    private String appIdCode;
    /**操作平台-名称*/
    private String appIdName;

    //-----用于系统返回参数计算
    /**系统计算赋值-可退总金额*/
    private BigDecimal approveRefundTotal = BigDecimal.ZERO;
    /**系统计算赋值-可退总积分*/
    private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
    /**系统计算赋值-分配金额*/
    private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
    /**系统计算赋值-分配积分*/
    private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;
    /**系统计算赋值-退款金额*/
    private BigDecimal refundTotal = BigDecimal.ZERO;
    /**系统计算赋值-退款积分*/
    private BigDecimal refundIntegral = BigDecimal.ZERO;

    /**操作类型-系统*/
    public static final String OP_TYPE_SYSTEM = "system";
    /**操作类型-用户*/
    public static final String OP_TYPE_USER = "user";
    /**操作类型-员工*/
    public static final String OP_TYPE_STAFF = "staff";

}