Merge remote-tracking branch 'origin/master-test' into master-test

chenjiahe

2023-07-03 10121f70218d5af50e68f343c18044073bd6d9ce

Merge remote-tracking branch 'origin/master-test' into master-test

 phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java

@@ -32,6 +32,8 @@
    List<AppearanceLabelDto> labelDtoList;
    /**颜值规则图片列表*/
    List<AppearancePictureDto> pictureDtoList;
    /** 到访订单id(门店助手使用统计使用) */
    private String visitOrderId;

    public AppearanceDto() {
    }

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java

@@ -4,6 +4,8 @@

import com.hz.his.dto.PageDto;
import lombok.Data;

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

/**
@@ -18,6 +20,8 @@
    private String operatorId;
    /**操作人名称*/
    private String operatorName;
    /**操作人类型*/
    private Integer operatorType;
    /**活动标识*/
    private String groupBuyId;
    private String id;
@@ -38,4 +42,11 @@
    /*用户优惠券*/
    private String couponNumberId;



    //开单结账一起执行校验优惠券接口使用参数
    /** 优惠券商品JSON数组字符 */
    private String couponGoodsArr;
    /** 订单应付金额 */
    private BigDecimal shouldTotal;
}

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java

@@ -11,8 +11,17 @@

    /**优惠券标识*/
    private String couponId;

    /**数量*/
    private Integer num;

    //多优惠券发放时使用字段
    /**批次号名称*/
    private String recordName;
    /**公共标识*/
    private String commonId;
    /**公共子标识*/
    private String commonItemId;
    /**公共类型(CouponRecordDto)*/
    private String commonType;

}

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java

@@ -16,6 +16,8 @@
    private String recordName;
    /**公共标识*/
    private String commonId;
    /**公共子标识*/
    private String commonItemId;
    /**公共类型*/
    private String commonType;

@@ -35,4 +37,6 @@
    public static final String TYPE_COMMON_QUEEN_DAY = "queen_day";
    /**公共标识类型,crm商品详情领取优惠券*/
    public static final String TYPE_COMMON_GOODS_DETAILS = "goods_details";
    /**公共标识类型,订单购买优惠券*/
    public static final String TYPE_COMMON_ORDER = "order";
}

 phis-feign/src/main/java/com/hz/his/dto/coupon/OrderSendCouponDto.java

New file
@@ -0,0 +1,44 @@
package com.hz.his.dto.coupon;

import lombok.Data;

import java.util.List;

/**
 * 订单发放优惠券dto
 * @USER: fhx
 * @DATE: 2023/6/27
 **/
@Data
public class OrderSendCouponDto {

    /**用户信息*/
    UserArrDto userArrDto;

    /** 优惠券信息列表 */
    private List<CouponItemDto> itemDtoList;

    /**来源编码,商户自定义服务来源标识*/
    private String appIdCode;
    /**操作人标识*/
    private String operatorId;
    /**操作人名称*/
    private String operatorName;
    /**操作人类型*/
    private Integer operatorType;


    //--------------------------------------------------------------------
    //对应phis表CouponReleaseRecord常量
    /**操作人类型-员工*/
    public static Integer OPERATOR_TYPE_EMPLOYEES = 0;
    /**操作人类型-管理员*/
    public static Integer OPERATOR_TYPE_ADMIN = 1;
    /**操作人类型-用户自领*/
    public static Integer OPERATOR_TYPE_USER = 2;
    /**操作人类型-系统*/
    public static Integer OPERATOR_TYPE_SYSTEM = 3;
    /**操作人类型-用户订单购买*/
    public static Integer OPERATOR_TYPE_USER_ORDER = 4;

}

 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/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,25 @@
package com.hz.his.dto.file;

import lombok.Data;

/**生成签名访问URL
 * @author CJH*/
@Data
public class FileSignVo {

    /**文件路径*/
    private String fileUrl;
    /**桶名称-可不传*/
    private String bucketName;

    private String fileName;

    private String method;

    public FileSignVo() {
    }

    public FileSignVo(String fileUrl) {
        this.fileUrl = fileUrl;
    }
}

 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/mp/MpQrCodeDto.java

New file
@@ -0,0 +1,30 @@
package com.hz.his.dto.mp;


/**
 * 小程序二维码dto
 */
public class MpQrCodeDto   {

    //ciq
    private String ciq;

    //门店编号
    private String shopCode;

    public String getCiq() {
        return ciq;
    }

    public void setCiq(String ciq) {
        this.ciq = ciq;
    }

    public String getShopCode() {
        return shopCode;
    }

    public void setShopCode(String shopCode) {
        this.shopCode = shopCode;
    }
}

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

@@ -26,11 +26,15 @@
    /** 平台来源  因为是his助手取消订单的话就要自动确认退款单  必填*/
    private Integer platformSource;

    /**his助手*/
    public static  Integer HIS_ASSISTANT = 0;
    /** 取消订单备注 */
    private String remarks;

    /**his助手*/
    public static final Integer HIS_ASSISTANT = 0;
     /**his后台*/
    public static  Integer HIS_BACKSTAGE = 1;
    public static final Integer HIS_BACKSTAGE = 1;
    /**导医*/
    public static final Integer PHIS_GUIDE = 2;


}

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

New file
@@ -0,0 +1,24 @@
package com.hz.his.dto.order;

import lombok.Data;

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

/**
 * 订单计算应付金额
 * @USER: fhx
 * @DATE: 2023/6/13
 **/
@Data
public class OrderCountShouldTotalDto {

    //门店id
    private String shopId;
    //用户优惠券
    private String couponNumberId;
    //订单应付金额
    private  BigDecimal shouldTotal;
    //商品item信息
    private List<OrderCountShouldTotalItemDto> itemDtoList;
}

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

New file
@@ -0,0 +1,24 @@
package com.hz.his.dto.order;

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

import java.math.BigDecimal;

/**
 * 订单计算应付金额item信息
 * @USER: fhx
 * @DATE: 2023/6/13
 **/
@Data
public class OrderCountShouldTotalItemDto {
    //商品类型
    private String type;
    //商品id
    private String commonId;
    //购买数量
    private Integer buyNum;
    //订单折扣
    private BigDecimal discount = BigDecimal.ZERO;
}

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

@@ -20,6 +20,8 @@
    private BigDecimal total;
    /**必填 子单总积分，实付积分(暂时用不上)*/
    private BigDecimal totalIntegral;
    /**非必填 子单总积分，开单时应付总积分(CRM积分订单时必填)*/
    private BigDecimal totalPoints;
    /**非必填 折扣(单位:百分比) 必填，默认100,不传后台默认100*/
    private BigDecimal discount;
    /**必填 购买数量 必填，默认0*/

 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/order/OrdersPHisTotalDto.java

@@ -52,6 +52,8 @@
    /**非必填 订单渠道来源名称(渠道/用户) */
    private String commonName;

    /**订单推荐人类型(UserChannelType)员工或者用户,默认用户*/
    private String inviteeType;
    /**crm必填 订单推荐人标识,三少说：crm必填 */
    private String inviteeId;
    /**非必填 订单推荐人名称(冗余),三少说：crm必填 不传,后台处理*/
@@ -62,6 +64,9 @@

    /**必填 订单总金额(订单类型是充值订单必填,否则非必填) */
    private BigDecimal total;

    /**非必填 订单总积分(订单类型是积分订单必填,否则非必填) */
    private BigDecimal totalPoints;

    /**非必填 订单其他信息(没有后台默认)*/
    private OrderInfoDto orderInfo;
@@ -91,4 +96,7 @@

    /**非必填 活动规则标识集合*/
    private List<String> activityIds;

    /** 治疗单id */
    private String treatSingleId;
}

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

@@ -22,4 +22,12 @@
    private String cardEquityId;
    /**非必填 卡包标识:卡项支付必传*/
    private String userCardId;

    /**
     * 标记字段，默认0
     * 支付方式为积分时：
     * isDel=100，则phis这边需要扣减用户积分
     * isDel=101，则phis这边不需要扣减用户积分
     */
    private Integer isDel = 0;
}

 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/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/report/PerformanceReqParamsDto.java

@@ -28,7 +28,10 @@
    private String deductStartTime;
    //执行结束时间
    private String deductEndTime;

    //业绩开始时间
    private String startTime;
    //业绩结束时间
    private String endTime;
    //所属门店id
    private String belongShopId;
    //服务门店id
@@ -84,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/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/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/SConsumablesService.java

@@ -35,4 +35,11 @@
     */
    @PostMapping(value = "/consumables/update/list")
    Result getUpdateConsumables(@RequestBody ConsumablesDto consumablesDto);

    /**
     * 获取优惠券商品列表
     * @return Result
     */
    @PostMapping(value = "/consumables/coupon/list")
    Result getConsumablesCouponList(@RequestBody PageDto pageDto);
}

 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/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,20 @@
    @PostMapping(value = "/cos/download-file")
    Response downloadFile(@RequestBody FileDownDto cosDownDto);

    /**
     *生成签名访问URL
     * @param fileSignVo 对象
     * @return 使用FileSignReturnVo转化
     */
    @PostMapping(value = "/cos/signUrl")
    Result signUrl(@RequestBody FileSignVo fileSignVo);

    /**
     *生成上传签名
     * @param fileSignVo 对象
     * @return 使用FileSignReturnVo转化
     */
    @PostMapping(value = "/cos/policy")
    Result policy(@RequestBody FileSignVo fileSignVo);

}

 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

@@ -283,4 +283,40 @@
     * */
    @PostMapping(value = "/user/next/level")
    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);

    /**
     * 判断用户是否为再升美学会员（是否有购买再升美学卡项订单）
     * */
    @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/SPhipCouponService.java

@@ -2,6 +2,7 @@

import com.hx.resultTool.Result;
import com.hz.his.dto.coupon.CouponDto;
import com.hz.his.dto.coupon.OrderSendCouponDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -49,4 +50,18 @@
     */
    @PostMapping(value = "/coupon/check/coupon")
    Result checkCoupon(@RequestBody CouponDto couponDto);

    /**
     * 开放平台-检查优惠券是否可用 - 开单结账同时执行使用
     */
    @PostMapping(value = "/coupon/check/coupon/to/orderAndPay")
    Result checkCouponToOrderAndPay(@RequestBody CouponDto couponDto);

    /**
     * 开放平台-订单发放优惠券
     */
    @PostMapping(value = "/coupon/order/send/coupon")
    Result orderSendCoupon(@RequestBody OrderSendCouponDto couponDto);


}

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

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

import com.hx.resultTool.Result;
import com.hz.his.dto.mp.MpQrCodeDto;
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-qrcode")
public interface SPhipMpQrCodeService {

    /**
     * 开放平台- 用户扫码登记模块 注册绑定后创建his助手小程序码(MpQrCodeController-userTempVisitQrCode方法)
     */
    @PostMapping(value = "/mp/qrcode/user/temp/visit/qrcode")
    Result userTempVisitQrCode(@RequestBody MpQrCodeDto mpQrCodeDto);
}

 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")
@@ -173,4 +179,12 @@
    @PostMapping(value = "/order/refund/cancel")
    Result refundCancel(@RequestBody RefundCancelVo refundCancelVo);


    /**
     * 计算订单应付金额
     */
    @PostMapping(value = "/order/countOrderShouldTotal")
    Result countOrderShouldTotal(@RequestBody OrderCountShouldTotalDto dto);


}

 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,12 @@
     */
    @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/BiClinicPerfService.java

@@ -38,7 +38,9 @@
    @PostMapping("/admin/clinic/perf/cashierDetailList")
    Result cashierDetailList(@RequestBody ClinicPerfReqDto reqDto);


    /** 导出 -  收银详细列表 */
    @PostMapping("/admin/clinic/perf/exportCashierDetail")
    Result exportCashierDetail(@RequestBody ClinicPerfReqDto reqDto);


}

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

@@ -32,5 +32,8 @@
    @PostMapping("/report/consultant/cash/total/list")
    Result totalList(@RequestBody ConsultantCashReportDto dto);

    /** 导出 - 咨询师现金业绩 */
    @PostMapping("/report/consultant/cash/export")
    Result export(@RequestBody ConsultantCashReportDto dto);

}

 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/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/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/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/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,27 @@
     * 无转换
     */
    @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);

    /**
     * 导出划扣快照报表
     * 转换无
     */
    @PostMapping(value = "/exp/deduction/surface/data")
    Result deductionSurfaceData(@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/cos/OssRecoverVO.java

New file
@@ -0,0 +1,25 @@
package com.hz.his.vo.cos;

import lombok.Data;

/**
 * @ClassName OssRecoverVO
 * @Description cos生成签名返回vo
 * @Author wrh
 * @Date 2023/6/30 17:30
 * @Version 1.0
 */
@Data
public class OssRecoverVO {

    private String accessid;
    //签名
    private String signature;
    private String dir;
    private String host;
    //过期时间
    private String expire;



}

 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";

}

 phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java

@@ -12,7 +12,7 @@
 * */
@Data
public class GoodsDetailDt extends BaseDt {
    /**类型(1商品2药品)*/
    /**类型(1商品2药品3优惠券)*/
    private Integer type;
    /**编号*/
    private String serialNumber;
@@ -172,4 +172,9 @@
    private String bigTypeCode;
    /**药品大类名*/
    private String bigTypeName;

    //关联标识(类型为3则关联优惠券id)
    public String commonId;
    //兑换积分
    private BigDecimal integral;
}

 phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java

@@ -5,6 +5,7 @@
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

/**用户详情数据返回实体*/
@Data
@@ -77,5 +78,12 @@
    private String internetCorpUserId;
    //所属护士
    private String nurseCorpUserId;
    //第一次到店时间
    private Date firstArriveTime;
    //第一次下单时间(结账成功的时间)
    private Date firstPayOrderTime;
    //最后一次执行时间
    private Date lastDeductionTime;


}