退款接口修改

chenjiahe

2022-09-26 ed365a9b836ceb79227e1a3b967a713198826fed

退款接口修改

 crm-platform-feign/src/main/java/com/hz/crm/dto/RefundAmountConversion.java

File was deleted

 crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundAmountConversionDto.java

New file
@@ -0,0 +1,36 @@
package com.hz.crm.dto.order.refund;

import lombok.Data;

import java.math.BigDecimal;

/**
 * 退款 -金额转化记录
 * 现金可转储值金、增值金和积分
 * 储值金可转增值金和积分
 * 增值金可转积分
 */
@Data
public class RefundAmountConversionDto {

    /**Y - 被转化金额类型*/
    private Integer amountType;
    /**Y - 被转化金额（元/积分）*/
    private BigDecimal amountTotal;

    /**Y - 转化金额类型*/
    private Integer conversionType;
    /**Y - 转化金额（元/积分）*/
    private BigDecimal conversionTotal;

    /**********金额类型************/
    /**金额类型-现金*/
    public static final int AMOUNT_TYPE_CASH = 1;
    /**金额类型-储值金*/
    public static final int AMOUNT_TYPE_RECHARGE = 2;
    /**金额类型-增值金*/
    public static final int AMOUNT_TYPE_INCREMENT = 3;
    /**金额类型-积分*/
    public static final int AMOUNT_TYPE_INTEGRAL = 4;

}

 crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundAmountModelDto.java

New file
@@ -0,0 +1,27 @@
package com.hz.crm.dto.order.refund;

import lombok.Data;

import java.math.BigDecimal;

/**
 * 退款记录 - 金额退款方式
 * 现金可转储值金、增值金和积分
 * 储值金可转增值金和积分
 * 增值金可转积分
 */
@Data
public class RefundAmountModelDto {

    /**Y - 现金退款类型*/
    private Integer refundType;
    /**Y - 退款金额（元/积分）*/
    private BigDecimal amountTotal;

    /**********退款类型************/
    /**退款类型类型-微信*/
    public static final int REFUND_TYPE_WX = 0;
    /**退款类型类型-支付宝*/
    public static final int REFUND_TYPE_ZFB = 1;

}

 crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java

File was renamed from crm-platform-feign/src/main/java/com/hz/crm/dto/RefundDto.java
@@ -1,4 +1,4 @@
package com.hz.crm.dto;
package com.hz.crm.dto.order.refund;

import lombok.Data;

@@ -24,7 +24,9 @@
    /** 子订单集合 - 具体到子订单退款 */
    private List<RefundItemDto> itemList;
    /**金额转化集合*/
    List<RefundAmountConversion> conversionList;
    List<RefundAmountConversionDto> conversionList;
    /**现金金额退款方式*/
    List<RefundAmountModelDto> amountModelList;
    /** 退款备注 */
    private String remarks;


 crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundItemDto.java

File was renamed from crm-platform-feign/src/main/java/com/hz/crm/dto/RefundItemDto.java
@@ -1,4 +1,4 @@
package com.hz.crm.dto;
package com.hz.crm.dto.order.refund;

import lombok.Data;

@@ -10,7 +10,7 @@
 * @author wzh
 */
@Data
public class RefundItemDto extends IdDto {
public class RefundItemDto {

    /** 子订单id */
    private String orderItemId;

 crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java

@@ -1,9 +1,8 @@
package com.hz.crm.feign;

import com.hx.resultTool.Result;
import com.hz.crm.dto.OrderRefundDto;
import com.hz.crm.dto.OrderStatusDto;
import com.hz.crm.dto.RefundDto;
import com.hz.crm.dto.order.refund.RefundDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;