Merge branch 'master-prod-new'

wangrenhuang

2022-12-12 c7aa3363613eccd39c3e7ab5ae81a93ff9bbc722

Merge branch 'master-prod-new'

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

@@ -27,6 +27,8 @@
    public static String TYPE_COMMON_GROUP_ACTIVITY = "group_activity";
    /**公共标识类型,老带新*/
    public static String TYPE_COMMON_OLD_NEW = "old_new";
    /**公共标识类型,团购活动*/
    /**公共标识类型,礼品卡*/
    public static String TYPE_COMMON_GIFT = "gift";
    /**公共标识类型,营销优惠券*/
    public static String TYPE_COMMON_MARKE = "marketing";
}

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

New file
@@ -0,0 +1,25 @@
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 OrderPartRefundDto extends MarketingDto{
    /*******************必填项(注意继承的公共类MarketingDto)*************************/
    /**订单信息*/
    private OrdersTotalDto ordersTotalDto;
    /**本次退款申请总金额*/
    private BigDecimal refundTotal;
    /**本次退款支付方式*/
    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,20 @@
package com.hz.his.dto.marketing;

import lombok.Data;

/**
 * 部分退款申请-支付方式明细
 * */
@Data
public class RefundProjectDto {
    /**退的类型: OrderItemConstants*/
    private String projectType;
    /**退的标识 商品/项目/...*/
    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);

}