Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

wangrenhuang

2023-03-09 be8f87087cd6ab5b80e363805f2f582acfbed7b0

Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

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

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

import lombok.Data;

/**
 * 订单初始化实体
 */
@Data
public class OrderInitVo {

    /**订单标识*/
    private String orderId;

}

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

@@ -22,7 +22,9 @@
    private Integer refundNum;
    /** 实退金额 */
    private BigDecimal refundMoney;
    /** 实退原因 */
    /** 退款原因（员工） */
    private String remarks;
    /** 退款原因（用户） */
    private String refundReason;

    /** 退款二级子订单信息集合 */

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

@@ -21,6 +21,8 @@
    private Integer refundNum;
    /** 实退金额 */
    private BigDecimal refundMoney;
    /** 实退原因 */
    /** 退款原因（员工） */
    private String remarks;
    /** 退款原因（用户） */
    private String refundReason;
}

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

@@ -14,8 +14,10 @@

    /** 退款方式集合 */
    private List<OrderPayMethodDto> refundPayMethod;
    /** 备注 */
    /** 退款备注（员工） */
    private String remarks;
    /** 退款原因（用户） */
    private String refundReason;
    /** 退款信息集合 */
    private List<OrderItemRefundDto> refundList;
    /** 订单id */

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

@@ -11,15 +11,15 @@
 */
@Data
public class PayAmountDto {
    //必填 实际支付金额
    /**必填 实际支付金额*/
    private String amount;
    //必填 支付方式
    /**必填 支付方式*/
    private String method;
    //必填 商品/项目id/组合项标识(卡项支付时必传组合项标识)
    /**必填 商品/项目id/组合项标识(卡项支付时必传组合项标识)*/
    private String commonId;

    //非必填 权益类型:卡项支付必传
    /**非必填 权益类型:卡项支付必传*/
    private String cardEquityId;
    //非必填 卡包标识:卡项支付必传
    /**非必填 卡包标识:卡项支付必传*/
    private String userCardId;
}

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

@@ -9,7 +9,6 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;

/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀

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

@@ -157,4 +157,11 @@
     */
    @PostMapping(value = "/order/whole/refund")
    Result wholeRefund(@RequestBody OrderRefundDto orderRefundDto);

    /**
     * 重新初始化订单金额
     * 根据支付记录去重新算各种金额
     */
    @PostMapping(value = "/order/init/order-money")
    Result initOrderMoney(@RequestBody OrderInitVo orderInitVo);
}