crm-platform-feign/src/main/java/com/hz/crm/dto/RefundAmountConversion.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
crm-platform-feign/src/main/java/com/hz/crm/dto/RefundDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
crm-platform-feign/src/main/java/com/hz/crm/dto/RefundItemDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
crm-platform-feign/src/main/java/com/hz/crm/dto/RefundAmountConversion.java
New file @@ -0,0 +1,47 @@ package com.hz.crm.dto; import lombok.Data; import java.math.BigDecimal; /** * 退款 -金额转化记录 * 现金可转储值金、增值金和积分 * 储值金可转增值金和积分 * 增值金可转积分 */ @Data public class RefundAmountConversion { /*被转化金额类型*/ private Integer amountType; /*被转化金额(元/积分)*/ private BigDecimal amountTotal = BigDecimal.ZERO; /*转化金额类型conversion*/ private Integer conversionType; /*转化金额(元/积分)*/ private BigDecimal conversionTotal = BigDecimal.ZERO; /*********订单来源***********/ /*订单类型(RefundRecordConstants)*/ private Integer orderType; /*订单id*/ private String orderId; //更换子订单id/其他id private String otherId; /*退款总表id*/ private String refundGeneralId; /**********金额类型************/ /**金额类型-现金*/ 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/RefundDto.java
New file @@ -0,0 +1,48 @@ package com.hz.crm.dto; import lombok.Data; import java.math.BigDecimal; import java.util.List; /** * 退款订单信息 * 实际退款的金额数据是填充在这里的 * @author wzh */ @Data public class RefundDto { /**必填 订单类型(RefundRecordConstants) */ private Integer refundOrderType; /**必填 订单id */ private String orderId; /** 其他订单id */ private String otherId; /**必填 退款类型(0:退次数退款,1:仅退款 默认:0) */ private Integer refundType; /** 子订单集合 - 具体到子订单退款 */ private List<RefundItemDto> itemList; /**金额转化集合*/ List<RefundAmountConversion> conversionList; /** 退款备注 */ private String remarks; /**必填 退款第三方支付总金额(微信/支付宝支付/其他)(元) */ private BigDecimal refundAmountTotal; /**必填 退款储值金总金额(元) */ private BigDecimal refundRecharge; /**必填 退款增值金总金额(元) */ private BigDecimal refundIncrement; /**必填 退款总积分 */ private BigDecimal refundIntegral; ////操作人信息 /**必填 操作人类型 */ private Integer operatorType; /**必填 操作人id */ private String operatorId; /**必填 操作人名称 */ private String operatorName; } crm-platform-feign/src/main/java/com/hz/crm/dto/RefundItemDto.java
New file @@ -0,0 +1,33 @@ package com.hz.crm.dto; import lombok.Data; import java.math.BigDecimal; /** * 退款子订单数据 * 辅助实体数据,主要是用来识别退款金额来源,方便后续的数据变更保存 * @author wzh */ @Data public class RefundItemDto extends IdDto { /** 子订单id */ private String orderItemId; /** 其他订单id */ private String otherId; /** 退回数量 */ private Integer refundNum; /** 退款总金额(元) */ private BigDecimal refundTotal; /** 退款总积分 */ private BigDecimal refundIntegral; /**现金退款金额(元*/ private BigDecimal refundMoney = BigDecimal.ZERO; /**退款储值金(元)*/ private BigDecimal refundFund = BigDecimal.ZERO; /**退款增值金(元)*/ private BigDecimal refundIncrement = BigDecimal.ZERO; } crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java
@@ -3,6 +3,7 @@ import com.hx.resultTool.Result; import com.hz.crm.dto.OrderRefundDto; import com.hz.crm.dto.OrderStatusDto; import com.hz.crm.dto.RefundDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -20,5 +21,5 @@ /*退款*/ @RequestMapping("/order/refund") Result refundOrder(@RequestBody(required = false) OrderStatusDto orderStatusDto); Result refundOrder(@RequestBody(required = false) RefundDto refundDto); }