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

fwq

2022-12-06 415acae4b59fa45ddea9297c324030eba4ea69f7

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

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

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

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

import java.util.List;

/**
 * 营销助手订单部分退款申请入参
 * @author fwq
 */
@Data
public class OrderPartRefundDto extends MarketingDto{
    /*******************必填项(注意继承的公共类MarketingDto)*************************/
    /**订单信息*/
    private OrdersTotalDto ordersTotalDto;
    /**退款支付方式*/
    private List<PartRefundPayDto> partRefundPayDtoList;
    /**退款项目*/
    private List<RefundProjectDto> refundProjectDtoList;

}

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

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

import lombok.Data;

import java.math.BigDecimal;

/**
 * 部分退款申请-支付方式明细
 * */
@Data
public class PartRefundPayDto {
    /**退款支付方式标识*/
    private String payMethodId;
    /**退款支付方式编号*/
    private String payMethodNo;
    /**退款支付方式名称*/
    private String payMethodName;
    /**支付方式的退款金额*/
    private BigDecimal refundMoney;
}

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

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

import lombok.Data;

/**
 * 部分退款申请-支付方式明细
 * */
@Data
public class RefundProjectDto {
    /**退的项目标识*/
    private String projectId;
    /**退的项目编号*/
    private String projectNo;
    /**退的项目名称*/
    private String projectName;
    /**退的项目数量*/
    private Integer refundNum;
}

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

@@ -3,12 +3,10 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.marketing.OrderCancelDto;
import com.hz.his.dto.marketing.OrderDiscountDto;
import com.hz.his.dto.marketing.OrderPartRefundDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.math.BigDecimal;

/**
 * 营销助手
@@ -30,4 +28,10 @@
    Result applyOrderCancel(@RequestBody OrderCancelDto orderCancelDto);


    /**
     * 订单部分退款申请
     */
    @PostMapping(value = "/order/apply/part/refund")
    Result applyPartRefund(@RequestBody OrderPartRefundDto orderPartRefundDto);

}