Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign i...

zhangxu

2023-01-07 6be686a489be1fef3df7bfb7cdcdec597dd2d659

Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign into master-zhangxu

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

@@ -33,5 +33,9 @@

    /**优惠券标识*/
    private String couponId;
    /**发放优惠券参数-订单标识*/
    private String orderId;
    /*用户优惠券*/
    private String couponNumberId;

}

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

@@ -1,5 +1,7 @@
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;
@@ -34,4 +36,9 @@

    /**是否确认订单*/
    private Integer isCustomerConfirm;
    /**处方订单号*/
    private String prescriptionNo;
    /**处方订单id*/
    private String prescriptionId;

}

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

@@ -32,4 +32,7 @@
    private String cashier;
    //非必填 收银员门店
    private String cashierShopId;

    //非必填 优惠券id集合
    private List<String> userCouponIds;
}

 phis-feign/src/main/java/com/hz/his/dto/refund/RefundFundsDto.java

New file
@@ -0,0 +1,47 @@
package com.hz.his.dto.refund;

import lombok.Data;

import java.math.BigDecimal;

/**
 * 用户资金退款dto
 */
@Data
public class RefundFundsDto {

    // 退款金额
    private BigDecimal refundTotal;
    // 用户id
    private String userId;
    // 门店id
    private String shopId;
    // 收款方
    private String payee;
    // 开户行
    private String openBank;
    // 开户支行
    private String openBranch;
    // 账号
    private String account;
    // 备注
    private String remarks;
    // 操作人类型
    private Integer operatorType;
    // 操作人id
    private String operatorId;
    // 平台来源
    private String platformSource;

    // 营销助手审批标识
    private String applyId;
    // 退款标识
    private String refundId;
    // 0:审核失败,1:审核通过
    private Integer type;
    // 审核人标识
    private String examEmplId;

    public RefundFundsDto() {
    }
}

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

@@ -44,4 +44,9 @@
    @PostMapping(value = "/coupon/invalid/user/coupon")
    Result invalidCouponNumber(@RequestBody CouponDto couponDto);

    /**
     * 开放平台-检查优惠券是否可用
     */
    @PostMapping(value = "/coupon/check/coupon")
    Result checkCoupon(@RequestBody CouponDto couponDto);
}

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

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

import com.hx.resultTool.Result;
import com.hz.his.dto.refund.RefundFundsDto;
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-refund")
public interface SPhipRefundService {

    /**
     * 用户资金退款
     * @param refundFundsDto 参数
     * @return 返回
     */
    @PostMapping("/refund/user/funds")
    Result refundUserFunds(@RequestBody RefundFundsDto refundFundsDto);

    /**
     * 用户资金退款审核
     * @param refundFundsDto 参数
     * @return 返回
     */
    @PostMapping(value = "/refund/user/funds/approve")
    Result refundUserFundsApprove(@RequestBody RefundFundsDto refundFundsDto);
}